Merge r4060, r4061
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 20 Feb 2009 04:17:57 +0000 (04:17 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 20 Feb 2009 04:17:57 +0000 (04:17 +0000)
commit2c34f6d366478fa1e1913bd0f2c92e70dd2ff8ed
tree2198939e4c4ab078c770b5da93ef0c311c97f1cc
parent3f0436713d8e956866e06297786d7923544761e5
Merge r4060, r4061
applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
applications/luci-splash/root/etc/init.d/luci_splash