Merge branch 'VLAN-GUI' into VLAN-MultiSSID
commitbcc797fdc3feefdea491d4415b5016e76a6f7944
authorAugusto Bott <augusto@bott.com.br>
Mon, 5 Dec 2011 10:48:18 +0000 (5 08:48 -0200)
committerAugusto Bott <augusto@bott.com.br>
Mon, 5 Dec 2011 10:48:18 +0000 (5 08:48 -0200)
tree4710b5f1ca1930e19081988871d00f3215ed9002
parentcb0672c2c09f965ab081c44b7273c1ce7ded209d
parent11dc1a680623d8f3a747b830ca23a63f5bd4d27b
Merge branch 'VLAN-GUI' into VLAN-MultiSSID

* VLAN-GUI:
  Fix different DHCP lease times for each LAN bridge
  /etc/hosts completeness
  Lan Access: reordering of FORWARD iptables rules creation
release/src/router/rc/network.c