Merge branch 'VLAN-GUI' into VLAN-MultiSSID
commit3ec2b7724200de89c1740fdc19521b3fe1bab27f
authorAugusto Bott <augusto@bott.com.br>
Sun, 11 Mar 2012 15:20:20 +0000 (11 12:20 -0300)
committerAugusto Bott <augusto@bott.com.br>
Sun, 11 Mar 2012 15:20:20 +0000 (11 12:20 -0300)
tree491aca2143514a7f1b1c8a39a4441297d103063a
parentf3c2050cc54ce98dcaf32e3ddf0feb8c420011a5
parentd1b97fef19bec4e5714b0c01f2cc748dfa788e00
Merge branch 'VLAN-GUI' into VLAN-MultiSSID

* VLAN-GUI:
  Minor multiLAN/wireless bugfixes
  fix dhcp options for non-VLAN builds