Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Mon, 4 Feb 2008 18:06:44 +0000 (19:06 +0100)
committerStefano Zacchiroli <zack@debian.org>
Mon, 4 Feb 2008 18:06:44 +0000 (19:06 +0100)

Trivial merge