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

Trivial merge