Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 26 Jan 2012 22:19:50 +0000 (23:19 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 26 Jan 2012 22:19:50 +0000 (23:19 +0100)

Trivial merge