Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 27 Oct 2008 12:55:22 +0000 (13:55 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 27 Oct 2008 12:55:22 +0000 (13:55 +0100)

Trivial merge