Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Sat, 22 Dec 2007 15:16:22 +0000 (16:16 +0100)
committerStefano Zacchiroli <zack@debian.org>
Sat, 22 Dec 2007 15:16:22 +0000 (16:16 +0100)
commit6ac211295d84f969725b09943552323ec2eb1f30
treed3b6731fb349ef42bfe0f9c3694973d640331410
parent23ba6cef8f8e50a5c7f4593084ddb7458ac01196
parent3f8705faedae6f75e9227d2da15cc5808158e1bb
Merge branch 'master' of fettunta.org:/home/zack/git/homepage