Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 28 Mar 2011 17:09:14 +0000 (13:09 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 28 Mar 2011 17:09:14 +0000 (13:09 -0400)
commit116672d7d72d8181607f69ad22ad8bd0bb9d8348
treeac4a1ab122b063b2f10ff935dcbf792a4be42c3d
parente548b0c24575a91ba4678e9cf1b78e02ff15d887
parent144540f546892d6fd949cdbb8fe990c6f4781085
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info