Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 18 Mar 2012 18:22:49 +0000 (14:22 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 18 Mar 2012 18:22:49 +0000 (14:22 -0400)
commit23be8e3843eae94bb1ead23c62901c1d730a36c2
tree51a64e88d3ae04e0b5e7d6f739b1861a7dff410b
parenta812692a50de69215a8267c7b0b1d7bf62bdfa32
parentde00470dcf79f0163b9b0c9a0f4ca39cf9ba9427
Merge branch 'master' of ssh://git.ikiwiki.info