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

Trivial merge