Merge branch 'master' of http://wagnertech.de/git/projects
authorgnublin <michael@wagnertech.de>
Wed, 16 Nov 2016 18:29:08 +0000 (19:29 +0100)
committergnublin <michael@wagnertech.de>
Wed, 16 Nov 2016 18:29:08 +0000 (19:29 +0100)

Trivial merge