Merge branch 'tomato-miniupnpd' into tomato-ND-USBmod
commitbdb9694f11ef7f9725abf440a73385f6df3c2e51
authorFedor <fedork@ubuntu.(none)>
Sun, 2 May 2010 03:35:26 +0000 (1 23:35 -0400)
committerFedor <fedork@ubuntu.(none)>
Sun, 2 May 2010 03:35:26 +0000 (1 23:35 -0400)
tree75baaeab26167ba8f9a59dd2a50f654907ed4e50
parent62560b32ee79de2871a9592387172371dbc65998
parent35ecc4b34b0ded70ab66a0eedf32b08f7c9d3ff6
Merge branch 'tomato-miniupnpd' into tomato-ND-USBmod
release/src/router/rc/services.c