Merge branch 'olsrd'
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 18 Apr 2013 16:49:01 +0000 (18:49 +0200)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 18 Apr 2013 16:49:01 +0000 (18:49 +0200)
commitf9210484742e8e1010c4c17747ff1608418dc311
treeb17d1186b129e7272ebe238b294cc977a9980008
parent1e99610f2680ec75c9422504fa2c09b8e41716c0
parent0015a5a216914ddf35abccefb530b0f7c651c857
Merge branch 'olsrd'