Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 16 Nov 2016 01:31:01 +0000 (21:31 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 16 Nov 2016 01:31:01 +0000 (21:31 -0400)

Trivial merge