Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 22 Jul 2009 13:57:46 +0000 (15:57 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 22 Jul 2009 13:57:46 +0000 (15:57 +0200)

Trivial merge