Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 12 Oct 2010 07:16:14 +0000 (09:16 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 12 Oct 2010 07:16:14 +0000 (09:16 +0200)

Trivial merge