Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 31 Jan 2017 17:11:54 +0000 (13:11 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 31 Jan 2017 17:11:54 +0000 (13:11 -0400)

Trivial merge