luci-0.9: merge r6024, r6025
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 5 Apr 2010 17:39:35 +0000 (17:39 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 5 Apr 2010 17:39:35 +0000 (17:39 +0000)
commitf77d92b2bee1b2878b1b08b09763a9f47606503d
tree79be45c02627fe149e0b8af32d13694426e77e83
parent4efb7b28fad109683671561c7cfa3e3c04c3ff1c
luci-0.9: merge r6024, r6025
libs/nixio/root/lib/upgrade/luci-add-conffiles.sh
modules/admin-core/ipkg/postinst