Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 28 Sep 2010 09:25:30 +0000 (11:25 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 28 Sep 2010 09:25:30 +0000 (11:25 +0200)

Trivial merge