Merge r4182
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 30 Jan 2009 13:51:20 +0000 (13:51 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 30 Jan 2009 13:51:20 +0000 (13:51 +0000)
commit15e2fbca3f9b81bd57c29578101fa793938b3559
treeba3fa78991deb48c6e0fbb2ddacdf4df297dd123
parentf2b3332d3fd5b111d955841b1d1f795da5c2c2fc
Merge r4182
contrib/package/luci/Makefile
contrib/package/olsrd-luci/files/etc/config/olsrd