Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 17 Sep 2008 07:12:48 +0000 (09:12 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 17 Sep 2008 07:12:48 +0000 (09:12 +0200)

Trivial merge