Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 20 Dec 2010 09:28:32 +0000 (10:28 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 20 Dec 2010 09:28:32 +0000 (10:28 +0100)

Trivial merge