Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Mon, 28 Jan 2008 15:38:18 +0000 (16:38 +0100)
committerStefano Zacchiroli <zack@debian.org>
Mon, 28 Jan 2008 15:38:18 +0000 (16:38 +0100)
commitb48e018f55cef157d355d70870ab6e47f8a7ba93
tree860f85d58fdfeccbdb06ba60efdf0fbb2ec5ea23
parentff4145407ae4b63e58d705353ce220603b1ef601
parent2bfe5c5d7b25dccb1a397378a71e764e95d041cd
Merge branch 'master' of fettunta.org:/home/zack/git/homepage