Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 14 Jun 2010 15:48:51 +0000 (17:48 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 14 Jun 2010 15:48:51 +0000 (17:48 +0200)

Trivial merge