Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 20 Feb 2008 21:45:34 +0000 (16:45 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 20 Feb 2008 21:45:34 +0000 (16:45 -0500)
commit77894a6831ae9cc8a90adbc6de0ab3c92408c316
tree28dea1c20a1825829758082b3204b94d1805be00
parenta59af82bb85a037814d3f95d3c9841048b221ca0
parent73b891a434f9cc6c906e97092b7999e702ed4eff
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info