Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 21 Oct 2016 16:51:59 +0000 (12:51 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 21 Oct 2016 16:51:59 +0000 (12:51 -0400)

Trivial merge