luci-0.10: merge r7082

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index d3bec7cc99b5496f8099404aff86f62911869ca1..4fe10d0ed3bcd7602e0e07516a4f8616c7e79deb 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -264,4 +264,4 @@ c.write = function(self, section, value)
 end
 
 
-return m, m3, m2
+return m, m3 or m2, m3 and m2