Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 7 Nov 2011 16:50:45 +0000 (17:50 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 7 Nov 2011 16:50:45 +0000 (17:50 +0100)

Trivial merge