Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 26 Apr 2009 17:34:12 +0000 (19:34 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 26 Apr 2009 17:34:12 +0000 (19:34 +0200)

Trivial merge