Merge branch 'master' of http://wagnertech.de/git/projects
authorMEBIL <mebil@mebil.(none)>
Tue, 13 Dec 2016 12:07:32 +0000 (13:07 +0100)
committerMEBIL <mebil@mebil.(none)>
Tue, 13 Dec 2016 12:07:32 +0000 (13:07 +0100)

Trivial merge