Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 30 Sep 2010 07:31:51 +0000 (09:31 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 30 Sep 2010 07:31:51 +0000 (09:31 +0200)

Trivial merge