Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 29 Jun 2011 19:13:43 +0000 (21:13 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 29 Jun 2011 19:13:43 +0000 (21:13 +0200)

Trivial merge