Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 28 Nov 2009 10:55:24 +0000 (11:55 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 28 Nov 2009 10:55:24 +0000 (11:55 +0100)

Trivial merge