Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Thu, 8 Sep 2016 17:20:22 +0000 (13:20 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 8 Sep 2016 17:20:22 +0000 (13:20 -0400)

Trivial merge