Merge branch 'tomato-miniupnpd' into tomato-ND-USBmod
commitd3e3a2e8653cd9e5298652b745855733096b67f2
authorFedor <fedork@ubuntu.(none)>
Tue, 24 Feb 2009 03:10:14 +0000 (23 22:10 -0500)
committerFedor <fedork@ubuntu.(none)>
Tue, 24 Feb 2009 03:10:14 +0000 (23 22:10 -0500)
tree4c12e0495fe665c470d1479fd13ad1141a427450
parent3ae32ad4c3f784008a12f507b00ab7b30b984731
parent2e2f31b39b7a5d230cf4aead3ab4c85003ea4765
Merge branch 'tomato-miniupnpd' into tomato-ND-USBmod
release/src/router/Makefile
release/src/router/httpd/tomato.c
release/src/router/nvram/defaults.c