Merge branch 'master' into interface_cleanup
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 5 Apr 2016 06:09:21 +0000 (08:09 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 5 Apr 2016 06:09:21 +0000 (08:09 +0200)

Trivial merge