Merge r4178
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 28 Jan 2009 18:32:47 +0000 (18:32 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 28 Jan 2009 18:32:47 +0000 (18:32 +0000)
commit242bffe894f2fc7ca1ba196f27da4dee03e9f6a9
tree7cd82d48ff672ca11d0731e2f29b1bd93420a07f
parent1b4d4ff11a9d9cfe516b7d4ed85d603b6382b1c6
Merge r4178
applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua