Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Thu, 15 Sep 2016 04:37:58 +0000 (00:37 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 15 Sep 2016 04:37:58 +0000 (00:37 -0400)

Trivial merge