Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 31 May 2009 22:46:43 +0000 (00:46 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 31 May 2009 22:46:43 +0000 (00:46 +0200)

Trivial merge