Merge branch 'batman-adv'
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 18 Apr 2013 16:54:45 +0000 (18:54 +0200)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 18 Apr 2013 16:54:45 +0000 (18:54 +0200)

Trivial merge