Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 15 Apr 2008 08:32:42 +0000 (10:32 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 15 Apr 2008 08:32:42 +0000 (10:32 +0200)

Trivial merge