Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Feb 2008 05:32:15 +0000 (00:32 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Feb 2008 05:32:15 +0000 (00:32 -0500)
commit89000b48f3cb809b13aa64db79abb90d446458b9
tree26f322b3bc722651ce68e9ac7db4321e5b40d4f2
parent9f602728316096f235b3b28e7daacc7ece69bbd4
parentf77de93291700a4618a49988066c9b8be43f2c7e
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info