Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 28 Mar 2011 21:07:06 +0000 (23:07 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 28 Mar 2011 21:07:06 +0000 (23:07 +0200)

Trivial merge