Merge r4367-r4369
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 25 Mar 2009 16:50:45 +0000 (16:50 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 25 Mar 2009 16:50:45 +0000 (16:50 +0000)
commit49454b83342925b4a65393239ea2d5814d650630
treece5875847c7f506c30f8f2cb3f4f8f57ac8faf58
parent90e80d9f06f572010b0063ef66e74f8ec91a6dfa
Merge r4367-r4369
applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
contrib/package/olsrd-luci/Makefile
contrib/package/olsrd-luci/patches/160-add-mdns.patch [new file with mode: 0644]