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

Trivial merge