Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 13 Nov 2015 17:35:46 +0000 (13:35 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 13 Nov 2015 17:35:46 +0000 (13:35 -0400)
commitb6c1624d99f5bbded6f9a8f87b75c0909eca965a
tree40102660d10ffd6f5773184448c61ededd303f56
parentbb86eebfbd2ae01b19bf0d5c22ea8a0d0287c18c
parent3d05506230ba4bbb8c87f057366928df0f060aca
Merge branch 'master' of ssh://git-annex.branchable.com