Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 10 May 2010 20:38:36 +0000 (22:38 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 10 May 2010 20:38:36 +0000 (22:38 +0200)

Trivial merge