Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 1 Dec 2010 11:08:19 +0000 (12:08 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 1 Dec 2010 11:08:19 +0000 (12:08 +0100)

Trivial merge