Merge branch 't42'
authorDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 27 Feb 2019 09:29:50 +0000 (10:29 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 27 Feb 2019 09:29:50 +0000 (10:29 +0100)

Trivial merge