Merge branch 'master' of http://wagnertech.de/git/projects
authorMichael Wagner <michael@wagnertech.de>
Mon, 15 Oct 2018 20:37:01 +0000 (22:37 +0200)
committerMichael Wagner <michael@wagnertech.de>
Mon, 15 Oct 2018 20:37:01 +0000 (22:37 +0200)

Trivial merge