Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 4 Apr 2011 15:12:16 +0000 (17:12 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 4 Apr 2011 15:12:16 +0000 (17:12 +0200)

Trivial merge