Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 31 Oct 2016 22:34:27 +0000 (18:34 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 31 Oct 2016 22:34:27 +0000 (18:34 -0400)

Trivial merge