Merge remote branch 'remotes/origin/Teaman-IPTraffic' into Teaman-ND
* remotes/origin/Teaman-IPTraffic:
Bugfix: tx/rx info fixed on IP Traffic Transfer Rates page
IP Traffic visual enhancements
Static ARP binding
IPTraffic history is now kept only for configured addresses
cstats fixes, improvements on IP Traffic and QoS pages
Experimental/alternative IP Traffic monitor
Proper calculation of DHCP ranges for a subnet (first/last IP available, broadcast, subnet on IPv4)
Conflicts:
release/src/router/Makefile
release/src/router/httpd/bwm.c
release/src/router/httpd/tomato.c
release/src/router/nvram/defaults.c
release/src/router/rc/Makefile
release/src/router/rc/arpbind.c
release/src/router/rc/firewall.c
release/src/router/rc/init.c
release/src/router/www/about.asp
release/src/router/www/basic-static.asp
release/src/router/www/bwm-common.js
release/src/router/www/ipt-24.asp
release/src/router/www/ipt-daily.asp
release/src/router/www/ipt-details.asp
release/src/router/www/ipt-monthly.asp
release/src/router/www/ipt-realtime.asp
release/src/router/www/qos-ctrate.asp
release/src/router/www/qos-detailed.asp
release/src/router/www/tomato.js
15 files changed: