Merge remote-tracking branch 'origin/vendor/XZ'
authorzrj <zrj@dragonflybsd.org>
Wed, 24 Apr 2019 17:12:27 +0000 (20:12 +0300)
committerzrj <zrj@dragonflybsd.org>
Wed, 24 Apr 2019 17:12:27 +0000 (20:12 +0300)

Trivial merge