Merge r4331, r4332
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 15 Mar 2009 18:52:11 +0000 (18:52 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 15 Mar 2009 18:52:11 +0000 (18:52 +0000)
commit907f27f8b21919ba41be6b8ef212d8669dafccc9
tree60880040e23516a1426e04ed89fdb63e9a8a8ad2
parent24b099ef0ca32c676da096efa764a67bc1f84c66
Merge r4331, r4332
contrib/package/olsrd-luci/Makefile
contrib/package/olsrd-luci/files/etc/config/olsrd
contrib/package/olsrd-luci/files/etc/init.d/olsrd
contrib/package/olsrd-luci/patches/100-olsrd-hg-r3.patch [deleted file]
contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch