Merge branch 'master' of http://wagnertech.de/git/projects
authorMichael Wagner <michael@wagnertech.de>
Wed, 18 Jul 2018 09:41:39 +0000 (11:41 +0200)
committerMichael Wagner <michael@wagnertech.de>
Wed, 18 Jul 2018 09:41:39 +0000 (11:41 +0200)

Trivial merge