Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 4 May 2010 12:03:54 +0000 (14:03 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 4 May 2010 12:03:54 +0000 (14:03 +0200)

Trivial merge