Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 6 Sep 2009 10:36:18 +0000 (12:36 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 6 Sep 2009 10:36:18 +0000 (12:36 +0200)

Trivial merge