Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 2 Jan 2017 23:12:52 +0000 (19:12 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 2 Jan 2017 23:12:52 +0000 (19:12 -0400)

Trivial merge