| commit | e01aea1ba655ef30e1fc0b139a02ed77cd5cefc3 | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Mon, 7 Nov 2011 05:25:48 +0000 (7 03:25 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Mon, 7 Nov 2011 05:25:48 +0000 (7 03:25 -0200) | ||
| tree | 491446be29cdd31f591db0b18661364dc25778bd | tree |
| parent | 421756418d00f742218f5a62cf8fc2feb8262efb | commitdiff |
| parent | b8ab745f7be73ce41fa5b5dd7c14537e07a73304 | commitdiff |
Merge branch 'Teaman-ND' into Teaman-ND-SDHC
* Teaman-ND:
WPA: revised nas startup code
Cosmetics: Status - Overview
SSID broadcast on status-overview.asp
Hostname completeness (status-devices.asp)
Fix startup of IPT Traffic and static ARP binding 'services'
Status/Device List: don't assume any/all active DHCP leases are on/from br0
LAN access: new/revised iptables ruleset
Option to include (or not) VLAN-GUI
Increased netmask size/limit for LAN subnets
Conflicts:
release/src/Makefile
release/src/router/www/Makefile
* Teaman-ND:
WPA: revised nas startup code
Cosmetics: Status - Overview
SSID broadcast on status-overview.asp
Hostname completeness (status-devices.asp)
Fix startup of IPT Traffic and static ARP binding 'services'
Status/Device List: don't assume any/all active DHCP leases are on/from br0
LAN access: new/revised iptables ruleset
Option to include (or not) VLAN-GUI
Increased netmask size/limit for LAN subnets
Conflicts:
release/src/Makefile
release/src/router/www/Makefile