Merge remote-tracking branch 'remotes/origin/Toastman-RT' into Teaman-RT
* remotes/origin/Toastman-RT: (904 commits)
build, cosmetics
fixed broken K26 nf-conntrack rtsp module
Improvements around last bugfix
Bugfix: hostnames from static DHCP
removed several themes
BWM and static ARP optimizations
cosmetics
Revised Static ARP & Client Monitor
Revert "TCP: paws check and RFC1323 updates from upstream"
tidy up makefile, cosmetics
QoS/Transfer Rates page fixed for K24 builds + improvements for K26 builds
cosmetics changes to various pages
more QOS cosmetics and general improvements
Improvements on QoS details pages, more filtering options (IPv4, mostly)
add filters to qos-ctrate page
up to 80 QOS rules
fix snmp compilation
SNMP integration and GUI
add HFS/HFS+ Mac OS x read support
dlna update to 1.0.21
...
Conflicts:
release/src/Makefile
release/src/router/Makefile
release/src/router/config_base
release/src/router/httpd/bwm.c
release/src/router/httpd/httpd.c
release/src/router/httpd/tomato.c
release/src/router/httpd/tomato.h
release/src/router/rc/Makefile
release/src/router/rc/arpbind.c
release/src/router/rc/bwclimon.c
release/src/router/rc/firewall.c
release/src/router/rc/init.c
release/src/router/rc/rc.h
release/src/router/rc/services.c
release/src/router/www/Makefile
release/src/router/www/about.asp
release/src/router/www/advanced-wireless.asp
release/src/router/www/basic-network.asp
release/src/router/www/basic-static.asp
release/src/router/www/bwm-common.js
release/src/router/www/forward-upnp.asp
release/src/router/www/interfaces.js
release/src/router/www/qos-ctrate.asp
release/src/router/www/qos-detailed.asp
release/src/router/www/status-data.jsx
release/src/router/www/status-webmon.asp
release/src/router/www/tomato.js
45 files changed: