Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 16 Feb 2012 10:58:45 +0000 (11:58 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 16 Feb 2012 10:58:45 +0000 (11:58 +0100)

Trivial merge