Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 10 Dec 2007 20:14:07 +0000 (15:14 -0500)
committerJoey Hess <joey@kitenet.net>
Mon, 10 Dec 2007 20:14:07 +0000 (15:14 -0500)
commit031ec6a47cc81eb1b6f8be708381b30c29785882
treeece3e3a7c237007c5b5de6a33def74c14158b402
parent58049e97c13b9fc81c31eb03df6b3cffc31d0165
parent0a56f05b53c8b9a91478c2af932a60c4a46c441b
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info