Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 27 Oct 2009 17:26:53 +0000 (18:26 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 27 Oct 2009 17:26:53 +0000 (18:26 +0100)

Trivial merge