Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 18 Nov 2015 16:21:12 +0000 (12:21 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 18 Nov 2015 16:21:12 +0000 (12:21 -0400)
commite88582ecad8a7e9b67552e2356e22f9a6030a3e4
treeedba09ed18a2376a843f9dc2de8c5c82b7ac2737
parentdcb1884851e532648ad8107e1841c011ee297643
parent0040e5a7332d3c3f117b14b3b41dfba95879e62c
Merge branch 'master' of ssh://git-annex.branchable.com