Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 14 Nov 2016 20:50:14 +0000 (16:50 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 14 Nov 2016 20:50:14 +0000 (16:50 -0400)

Trivial merge