Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 16 Dec 2015 00:50:52 +0000 (20:50 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 16 Dec 2015 00:50:52 +0000 (20:50 -0400)
commit1c3b64434583bdbac6ad241b91e653979ac5fc9e
tree31bd785102466bf0e10e5ef2e70cf5126b36dff0
parent25bc6ea6d8d6b980a69c69aeee844c5cd4401c5c
parent555f5ae302cd50827796d6acab63349bcbb21164
Merge branch 'master' of ssh://git-annex.branchable.com