Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 27 Feb 2010 14:15:01 +0000 (15:15 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 27 Feb 2010 14:15:01 +0000 (15:15 +0100)

Trivial merge