Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 16 May 2009 09:43:25 +0000 (11:43 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 16 May 2009 09:43:25 +0000 (11:43 +0200)

Trivial merge