Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 5 Dec 2009 21:25:13 +0000 (22:25 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 5 Dec 2009 21:25:13 +0000 (22:25 +0100)

Trivial merge