Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 29 Jan 2009 16:24:40 +0000 (17:24 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 29 Jan 2009 16:24:40 +0000 (17:24 +0100)
commit04aa572e31ad9db8dad2e735d9be3ae56e58b155
treeade4541bae956486aecc2f2db40b36311ce06a74
parent7b23ebbbbf60bf8a2d07ed8be6f810fbf8f84109
parent4c40673a978980511354fe1b5d457e2a299b6b70
Merge branch 'master' of fettunta.org:/home/zack/git/homepage