Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 26 Nov 2007 19:19:10 +0000 (14:19 -0500)
committerJoey Hess <joey@kitenet.net>
Mon, 26 Nov 2007 19:19:10 +0000 (14:19 -0500)
commit8df24a447d9bcae138873bc076432e6a69946d7f
tree1153562d3c31a0363903340e17223a3f440e7804
parent23545d3b5fd87e955c380bfe7e342675aa5d54ac
parent8eac17928795859c403d39c512f99a49267fbb8f
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info