Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 7 Dec 2008 12:11:23 +0000 (13:11 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 7 Dec 2008 12:11:23 +0000 (13:11 +0100)

Trivial merge