Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 15 Nov 2016 22:26:58 +0000 (18:26 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 15 Nov 2016 22:26:58 +0000 (18:26 -0400)

Trivial merge