Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 29 Jun 2011 15:10:28 +0000 (17:10 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 29 Jun 2011 15:10:28 +0000 (17:10 +0200)

Trivial merge