Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 2 Nov 2016 14:37:50 +0000 (10:37 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 2 Nov 2016 14:37:50 +0000 (10:37 -0400)

Trivial merge