Merge branch 'master' of git.upsilon.cc:homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 22 Jun 2013 10:18:39 +0000 (12:18 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 22 Jun 2013 10:18:39 +0000 (12:18 +0200)

Trivial merge