Merge branch 'tomato-miscset' into tomato-ND-USBmod
commit4ab73d80a696fd26303d1be955612e001c05b6b4
authorFedor <fedork@ubuntu.(none)>
Sat, 7 Nov 2009 20:38:48 +0000 (7 15:38 -0500)
committerFedor <fedork@ubuntu.(none)>
Sat, 7 Nov 2009 20:38:48 +0000 (7 15:38 -0500)
tree41796451fdc61193fc13eeeeb180f6fcbfb29956
parentd37c5d3db6224aaa5267e12ecf095451592c7c37
parent012fbcb71a2d5b2e2fe258dde981f7a01989f9e8
Merge branch 'tomato-miscset' into tomato-ND-USBmod
release/src/router/httpd/tomato.c
release/src/router/nvram/defaults.c
release/src/router/rc/firewall.c
release/src/router/rc/init.c
release/src/router/rc/services.c
release/src/router/www/basic-static.asp
release/src/router/www/tools-wol.asp