Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 19 Dec 2007 22:32:18 +0000 (17:32 -0500)
committerJoey Hess <joey@kitenet.net>
Wed, 19 Dec 2007 22:32:18 +0000 (17:32 -0500)
commite9a40c8716afd6076c630a140186ee7b2ec9cfb4
tree7d4fd69aad5e358444a9cbc25aa577ded7744e45
parent852999c5e1d62ce9302e6e7c8a14b8ac4741d802
parent71d1fb4326d59a1179578244da1ac6d91aedf79d
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info