Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 12 Aug 2010 08:04:29 +0000 (10:04 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 12 Aug 2010 08:04:29 +0000 (10:04 +0200)

Trivial merge