Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Sat, 22 Dec 2007 15:16:22 +0000 (16:16 +0100)
committerStefano Zacchiroli <zack@debian.org>
Sat, 22 Dec 2007 15:16:22 +0000 (16:16 +0100)

Trivial merge