Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 10 Dec 2008 16:58:59 +0000 (17:58 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 10 Dec 2008 16:58:59 +0000 (17:58 +0100)

Trivial merge