Merge tag 'jupp-3_1_31'
authormirabilos <m@mirbsd.org>
Wed, 9 Aug 2017 03:52:16 +0000 (05:52 +0200)
committermirabilos <m@mirbsd.org>
Wed, 9 Aug 2017 03:52:16 +0000 (05:52 +0200)
joe-3.1jupp31.tgz


Trivial merge