Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 23 Nov 2009 08:17:58 +0000 (09:17 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 23 Nov 2009 08:17:58 +0000 (09:17 +0100)

Trivial merge