Merge branch 'master' of git.upsilon.cc:homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 8 May 2013 22:46:21 +0000 (00:46 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 8 May 2013 22:46:21 +0000 (00:46 +0200)

Trivial merge