merge r28146
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 1 Sep 2011 20:05:10 +0000 (20:05 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 1 Sep 2011 20:05:10 +0000 (20:05 +0000)
commit3e64da5e4df0357c919fe49c2dfac65b1b3ad1eb
tree24969fd40ef49339d078b62292d27a865912ff60
parent78bfea8d0671365fd285546a602fb6e042bc0973
merge r28146

SVN-Revision: 28147
net/lighttpd/Makefile
net/lighttpd/files/lighttpd.conf