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

Trivial merge