Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 30 Nov 2010 08:55:09 +0000 (09:55 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 30 Nov 2010 08:55:09 +0000 (09:55 +0100)

Trivial merge