Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 24 Jul 2008 08:20:24 +0000 (10:20 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 24 Jul 2008 08:20:24 +0000 (10:20 +0200)

Trivial merge