Merge branch 'origtgz'
authormirabilos <m@mirbsd.org>
Wed, 11 Jan 2017 21:08:23 +0000 (22:08 +0100)
committermirabilos <m@mirbsd.org>
Wed, 11 Jan 2017 21:08:23 +0000 (22:08 +0100)

Trivial merge