Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 31 Mar 2008 09:29:10 +0000 (11:29 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 31 Mar 2008 09:29:10 +0000 (11:29 +0200)

Trivial merge