Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Fri, 25 Jan 2008 15:20:50 +0000 (16:20 +0100)
committerStefano Zacchiroli <zack@debian.org>
Fri, 25 Jan 2008 15:20:50 +0000 (16:20 +0100)
commitdce48d491c83790dd9332a86eac8dfbcadac7641
treee8b891cdc4a5ce763adde4a6be4a824e383ea2f4
parentea491d537fb7f0a868e63ed9a452d22631708bb2
parentad881fba298fac0adbe79febac53f48500236a4f
Merge branch 'master' of fettunta.org:/home/zack/git/homepage