Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Wed, 23 Jan 2008 11:30:38 +0000 (12:30 +0100)
committerStefano Zacchiroli <zack@debian.org>
Wed, 23 Jan 2008 11:30:38 +0000 (12:30 +0100)
commitdc7e97818f2dbef25048693f2603f90064ab0e98
tree8a25b7b57bd318cae22f7b660151517d5faf296b
parentd1d17f8b99314fb57b4d0ae992a8d5105e4b45d5
parenta1eb139d695626b9c0313c3a0a5fa6ecdde11785
Merge branch 'master' of fettunta.org:/home/zack/git/homepage