Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 2 Nov 2008 21:36:22 +0000 (22:36 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 2 Nov 2008 21:36:22 +0000 (22:36 +0100)

Trivial merge