Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 19 Jul 2009 16:14:25 +0000 (18:14 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 19 Jul 2009 16:14:25 +0000 (18:14 +0200)

Trivial merge