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

Trivial merge