Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 29 Dec 2012 23:20:15 +0000 (00:20 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 29 Dec 2012 23:20:15 +0000 (00:20 +0100)

Trivial merge