Merge branch 'master' into endian
authorDagobert Michelsen <dam@opencsw.org>
Tue, 3 Apr 2018 12:42:56 +0000 (14:42 +0200)
committerDagobert Michelsen <dam@opencsw.org>
Tue, 3 Apr 2018 12:42:56 +0000 (14:42 +0200)

Trivial merge