| commit | 21dc585b02f7c9a44d0cd62fd146aa514d0f84ab | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Sat, 17 Dec 2011 15:01:51 +0000 (17 13:01 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Sat, 17 Dec 2011 15:01:51 +0000 (17 13:01 -0200) | ||
| tree | 98e55de4fb7a763eeb4aae97c716bb04c2aff778 | tree |
| parent | 1ca8722e7cd814b7292e8c867300b3af4d44a985 | commitdiff |
| parent | 0a047c904d6d1af6b9f5d78598dbde672039333d | commitdiff |
Merge branch 'Teaman-ND' into Teaman-ND-SDHC
* Teaman-ND:
VLAN-GUI: enforce config requirements for UPnP and IGMPproxy
* Teaman-ND:
VLAN-GUI: enforce config requirements for UPnP and IGMPproxy