Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 28 Dec 2016 16:25:37 +0000 (12:25 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 28 Dec 2016 16:25:37 +0000 (12:25 -0400)
commit23ffbbea94ac357da7ab19736cf1022679297afd
treef29d6072234802504e3c451ffddf82a4407f6630
parent9dabe85bb5b50fac0bfc8b40a18f785926ad53dc
parent9106a3873bc7f37fcea5a537178c71a5083586d7
Merge branch 'master' of ssh://git-annex.branchable.com