Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 16 Dec 2010 18:14:00 +0000 (14:14 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 16 Dec 2010 18:14:00 +0000 (14:14 -0400)
commit06f4532f3832924d28da535c2caccd6858d15018
tree05eaf0fb7d884b0ed11fcc92b91d8c4ff4a9e592
parent075d48c5f2287e6195258a1f0993eb8f69741f51
parentd0fdc973d3c793fa6f315014fcfa6823d057372a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info