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

Trivial merge