Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 17 Oct 2009 09:39:37 +0000 (11:39 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 17 Oct 2009 09:39:37 +0000 (11:39 +0200)

Trivial merge