Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 21 May 2010 08:42:41 +0000 (10:42 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 21 May 2010 08:42:41 +0000 (10:42 +0200)

Trivial merge