Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 2 Feb 2011 14:26:46 +0000 (15:26 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 2 Feb 2011 14:26:46 +0000 (15:26 +0100)

Trivial merge