Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 14 Mar 2012 12:51:52 +0000 (13:51 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 14 Mar 2012 12:51:52 +0000 (13:51 +0100)

Trivial merge