merge r28160
authorJo-Philipp Wich <[email protected]>
Sun, 4 Sep 2011 10:22:25 +0000 (10:22 +0000)
committerJo-Philipp Wich <[email protected]>
Sun, 4 Sep 2011 10:22:25 +0000 (10:22 +0000)
commit34a20ab05640dbc884e42185cdca6b5b2f1f0cdf
treefb47d3ed2bc6a054b25d08667d334c7c9233edba
parentc2e50bf17e4256db6c7c555470bea255cdc6c5f1
merge r28160

SVN-Revision: 28161
package/uhttpd/Makefile
package/uhttpd/src/uhttpd-file.c