Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 27 Sep 2008 15:17:39 +0000 (11:17 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 27 Sep 2008 15:17:39 +0000 (11:17 -0400)
commit415e9a678dcc32fc57b71aa6c47886cc1c94e359
tree0aa3f9e54fc558c480b33978aba6cac7530e8072
parent60a80be0b386c1499eecf62843545a91b020ddc8
parentbf9ae466be185f345b4b15145a8eb878ee7d41f4
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info