Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 18 Feb 2012 22:34:41 +0000 (23:34 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 18 Feb 2012 22:34:41 +0000 (23:34 +0100)

Trivial merge