Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 29 Jan 2009 16:24:40 +0000 (17:24 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 29 Jan 2009 16:24:40 +0000 (17:24 +0100)

Trivial merge