Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 30 Dec 2016 22:25:52 +0000 (18:25 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 30 Dec 2016 22:25:52 +0000 (18:25 -0400)
commit4385873b09acf37fbb27fc61c133f184d26ca941
tree322f490502459213b8450a8f9f1ce8187b505ce6
parent23d71423e19d9eb9f940b3011bbdabe0bf80aca6
parentf6fb0ec566130b9ba81ea30916d0c0f59b9a572a
Merge branch 'master' of ssh://git-annex.branchable.com