Merge branch 'origtgz'
authormirabilos <m@mirbsd.org>
Thu, 7 Dec 2017 02:15:19 +0000 (03:15 +0100)
committermirabilos <m@mirbsd.org>
Thu, 7 Dec 2017 02:15:19 +0000 (03:15 +0100)

Trivial merge