Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 20 Feb 2009 21:38:50 +0000 (22:38 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 20 Feb 2009 21:38:50 +0000 (22:38 +0100)

Trivial merge