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

Trivial merge