Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 9 Mar 2012 20:51:59 +0000 (21:51 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 9 Mar 2012 20:51:59 +0000 (21:51 +0100)

Trivial merge