Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 2 Mar 2010 08:10:59 +0000 (09:10 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 2 Mar 2010 08:10:59 +0000 (09:10 +0100)

Trivial merge