Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 17 Jan 2010 10:22:59 +0000 (11:22 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 17 Jan 2010 10:22:59 +0000 (11:22 +0100)

Trivial merge