Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sun, 8 Jan 2017 21:03:47 +0000 (17:03 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sun, 8 Jan 2017 21:03:47 +0000 (17:03 -0400)

Trivial merge