Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 8 May 2010 11:20:26 +0000 (13:20 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 8 May 2010 11:20:26 +0000 (13:20 +0200)

Trivial merge