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

Trivial merge