Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 7 Dec 2011 18:56:30 +0000 (14:56 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 7 Dec 2011 18:56:30 +0000 (14:56 -0400)
commit97363d7e9a0f3daa71ee6a54f8325386f9617a7f
tree1d6bf2a1fb4e3b4a0481b03ab753add838549c3d
parent4ff23d3712dcda0ecfd23c7c22dc6a35de1e39d8
parent97b2345f8cb2ee013a5ecee259cd897f210aa9c1
Merge branch 'master' of ssh://git.ikiwiki.info