Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 29 Jun 2009 16:39:55 +0000 (18:39 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 29 Jun 2009 16:39:55 +0000 (18:39 +0200)

Trivial merge