Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 16 Oct 2009 07:10:08 +0000 (09:10 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 16 Oct 2009 07:10:08 +0000 (09:10 +0200)

Trivial merge