merge r25220
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 28 Jan 2011 19:51:13 +0000 (19:51 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 28 Jan 2011 19:51:13 +0000 (19:51 +0000)
commit5afedf36f436d6e5b98c282fe8822854e7a6956f
treeaca9093ccd4370c4fb8949d444b617549080fb6e
parent0d7ee7811c773df7fb54fa30b26c66e4b002d10a
merge r25220

SVN-Revision: 25221
package/uhttpd/Makefile
package/uhttpd/src/uhttpd.c