Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 23 Jan 2011 09:24:27 +0000 (10:24 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 23 Jan 2011 09:24:27 +0000 (10:24 +0100)

Trivial merge