Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 13 Sep 2008 08:52:55 +0000 (10:52 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 13 Sep 2008 08:52:55 +0000 (10:52 +0200)

Trivial merge