Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 2 Oct 2009 18:55:37 +0000 (14:55 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 2 Oct 2009 18:55:37 +0000 (14:55 -0400)
commit44b23e9f4aa96a49527ba197053241706ecb81ff
treefb221020a796efed4b0f23cdd9e60078ccb71a52
parent547bbebcbc81d13d79eeb72e9c1bf7f95f514835
parente0bb2396b59ab42d47d6c3b721008d741247c132
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info