Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 13 Mar 2012 09:26:42 +0000 (10:26 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 13 Mar 2012 09:26:42 +0000 (10:26 +0100)

Trivial merge