Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 23 Nov 2010 13:45:36 +0000 (14:45 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 23 Nov 2010 13:45:36 +0000 (14:45 +0100)

Trivial merge