Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 7 Apr 2009 13:43:41 +0000 (15:43 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 7 Apr 2009 13:43:41 +0000 (15:43 +0200)

Trivial merge