Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 24 Jul 2009 13:46:12 +0000 (15:46 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 24 Jul 2009 13:46:12 +0000 (15:46 +0200)

Trivial merge