Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Thu, 28 Feb 2008 12:59:42 +0000 (13:59 +0100)
committerStefano Zacchiroli <zack@debian.org>
Thu, 28 Feb 2008 12:59:42 +0000 (13:59 +0100)
commita5eea6d67c8f24175b22bb9b7010ab2370875685
treebfe2975d2f35654fe4f7dd778912448d13b8c6a1
parent652af52e5394859b7bf66b0be206f632ce50d7df
parent367fb2060b21f94762d45c8e700a562acecf83a4
Merge branch 'master' of fettunta.org:/home/zack/git/homepage