Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 13 Oct 2010 16:59:36 +0000 (12:59 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 13 Oct 2010 16:59:36 +0000 (12:59 -0400)
commitac4883dd4a1fab814c77cc90df1a02776e7e28d0
treebdd72d585c57d40f5d6675d0f76415f18eb9208d
parent8555d10f6369d78c44cf4677010b7e1260d9f5c0
parent71fdabcb494d3f6e62bf755246c480ac7fc17156
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info