Merge branch 'Toastman-NRT' into Toastman-RT-ACToastman-1.28.0511.5
commit076cada48b8b79242bcc71af06d0fa0027070143
authorToastman <toastman@galactic_core>
Fri, 20 Jan 2017 13:44:27 +0000 (20 20:44 +0700)
committerToastman <toastman@galactic_core>
Fri, 20 Jan 2017 13:44:27 +0000 (20 20:44 +0700)
tree4c9c92ec3e583bf6a790faf7b5f71dc3a9a5a55c
parent250e0320801d5bd6a1ca056bfddf778c544b82d9
parent5992a37eade475d1aeff90feab2d91fe7a1b9dce
Merge branch 'Toastman-NRT' into Toastman-RT-AC
release/src/router/httpd/tomato.c
release/src/router/nvram/defaults.c