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

Trivial merge