Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Aug 2008 18:23:38 +0000 (14:23 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Aug 2008 18:23:38 +0000 (14:23 -0400)
commit137624775407e433935f68b9ee282723adca1513
treed318b8fdbebac36123239be31a9e739ee406ec3c
parentefcbb32f7c54ad8ffa2e56d52e651c18bd8be55a
parentd9db5f2def7a1dd2c8e76195df1ea1a988b6b79e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info