Merge r4176
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 28 Jan 2009 18:26:07 +0000 (18:26 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 28 Jan 2009 18:26:07 +0000 (18:26 +0000)
commit1b4d4ff11a9d9cfe516b7d4ed85d603b6382b1c6
treef47e03a0c92304bc1574edcb0220513683ac7cfe
parent27109e5245f5f553bd3ea4e59914482202e75aa7
Merge r4176
applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua