Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 17 Mar 2012 10:48:38 +0000 (11:48 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 17 Mar 2012 10:48:38 +0000 (11:48 +0100)

Trivial merge