Merge branch 'VLAN-GUI' into VLAN-MultiSSID
commit0091b046ab7d5f9041c95d21d9cae811742ab837
authorAugusto Bott <augusto@bott.com.br>
Sat, 17 Dec 2011 15:01:17 +0000 (17 13:01 -0200)
committerAugusto Bott <augusto@bott.com.br>
Sat, 17 Dec 2011 15:01:17 +0000 (17 13:01 -0200)
treeb3868f6b1a34af1568a9cdfc9009e6d9dc5f01d4
parentf86a85ce46d2ecdfc3e84fdc1688e47889c756b8
parent94372aca84197eedbd7ce0c01467bf3a6891eb7d
Merge branch 'VLAN-GUI' into VLAN-MultiSSID

* VLAN-GUI:
  VLAN-GUI: enforce config requirements for UPnP and IGMPproxy