Merge branch 'Teaman-ND' into Teaman-ND-SDHC
commit074916ec77763fa20efd2fcf360c02467c975f08
authorAugusto Bott <augusto@bott.com.br>
Fri, 2 Dec 2011 07:29:48 +0000 (2 05:29 -0200)
committerAugusto Bott <augusto@bott.com.br>
Fri, 2 Dec 2011 07:29:48 +0000 (2 05:29 -0200)
tree8f3d47d51d771bcca7f7338df47c91eac848dfbd
parent25eb58000297fbbec1ecca2f9e47641dd06bbf2e
parent159af8c6475729a35386e86a0b0b56393b45b4b9
Merge branch 'Teaman-ND' into Teaman-ND-SDHC

* Teaman-ND:
  Option to show hostnames and/or IPs on IPTraffic graphics
release/src/router/httpd/tomato.c
release/src/router/nvram/defaults.c