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

Trivial merge