Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
commit4b5e4a9e37b1f28a68bec8c78a8fe3ef4b811f3b
authorJoey Hess <joey@kitenet.net>
Thu, 17 Mar 2011 21:09:39 +0000 (17 17:09 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 17 Mar 2011 21:09:39 +0000 (17 17:09 -0400)
treebbbdeb3814ff2491daeec9a4a0d8bd899d420297
parentd162bf767e1e57502c4a767fa5a6ec42a5857c59
parent70f646248821ebd608b65481d0f85fac8931f42e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info