Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 26 Apr 2010 17:41:22 +0000 (13:41 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 26 Apr 2010 17:41:22 +0000 (13:41 -0400)
commitd4a1d88dbe4b3d1239c9a404fca9d2261e7f0812
treebd8903dae96a2dfc6ba219bd886bb2873e5cb8d0
parent506075695f32a63bfc8b57cef1a601bd937b7a72
parentd3c994d980c2f52102c78c0157ce06140c639bc6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info