Merge branch 'master' of http://wagnertech.de/git/projects
authorMEBIL <mebil@mebil.(none)>
Thu, 16 Feb 2017 20:51:13 +0000 (21:51 +0100)
committerMEBIL <mebil@mebil.(none)>
Thu, 16 Feb 2017 20:51:13 +0000 (21:51 +0100)

Trivial merge