Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 27 Mar 2009 13:09:24 +0000 (14:09 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 27 Mar 2009 13:09:24 +0000 (14:09 +0100)

Trivial merge