Merge branch 'master' of github.com:HRogge/packages
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 31 May 2016 06:59:57 +0000 (08:59 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 31 May 2016 06:59:57 +0000 (08:59 +0200)

Trivial merge