Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 17 Dec 2008 22:27:47 +0000 (23:27 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 17 Dec 2008 22:27:47 +0000 (23:27 +0100)

Trivial merge