Merge remote-tracking branch 'openwrt/master'
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 10 Aug 2015 12:09:48 +0000 (14:09 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 10 Aug 2015 12:09:48 +0000 (14:09 +0200)

Trivial merge