Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 7 Feb 2011 22:34:35 +0000 (23:34 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 7 Feb 2011 22:34:35 +0000 (23:34 +0100)

Trivial merge