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

Trivial merge