Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Thu, 2 Feb 2017 18:18:45 +0000 (14:18 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 2 Feb 2017 18:18:45 +0000 (14:18 -0400)

Trivial merge