Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 30 Dec 2016 14:48:56 +0000 (10:48 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 30 Dec 2016 14:48:56 +0000 (10:48 -0400)
commitb2834db613bc3a557bd609dbaacaef097c5ebab3
treeccbc5b3fcc35195b516848433b02dc2fc7565ac7
parenta03c51988f78be4153928d92e7cae8e2e15c7709
parentc2325c264014eceefa9eed7e35cef93658677d5c
Merge branch 'master' of ssh://git-annex.branchable.com