Merge branch 'master' of http://wagnertech.de/git/projects
authorgnublin <michael@wagnertech.de>
Wed, 27 Jul 2016 10:22:52 +0000 (12:22 +0200)
committergnublin <michael@wagnertech.de>
Wed, 27 Jul 2016 10:22:52 +0000 (12:22 +0200)

Trivial merge