Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Thu, 20 Dec 2007 19:02:51 +0000 (20:02 +0100)
committerStefano Zacchiroli <zack@debian.org>
Thu, 20 Dec 2007 19:02:51 +0000 (20:02 +0100)
commitac4c48702c6591ea199838ea0c05c400ddde7d9a
tree2e5aa018a663ca137cbbb42e8a0822f8d2c6c028
parent0b215a609f556eea77ec253cd910334e9e52b9b9
parent522ca93db09dfe294de63728fa702ee173e1b91c
Merge branch 'master' of fettunta.org:/home/zack/git/homepage