Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Thu, 24 Jan 2008 09:35:37 +0000 (10:35 +0100)
committerStefano Zacchiroli <zack@debian.org>
Thu, 24 Jan 2008 09:35:37 +0000 (10:35 +0100)

Trivial merge