Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 26 Mar 2009 17:08:35 +0000 (18:08 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 26 Mar 2009 17:08:35 +0000 (18:08 +0100)

Trivial merge