[packages_10.03.2] httptunnel: merge r29199, r29226
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 4 Feb 2012 20:01:22 +0000 (20:01 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 4 Feb 2012 20:01:22 +0000 (20:01 +0000)
commitd88854fda620d9cee688af2fb1acd46879c82ec6
treeb0b0b4266755bab311124dc1058ea79ea0b3f78b
parent7090951a0c380e571f72d24f5cb59aa523fe1318
[packages_10.03.2] httptunnel: merge r29199, r29226

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30098 3c298f89-4303-0410-b956-a3cf2f4a3e73
net/httptunnel/Makefile
net/httptunnel/files/httptunnel.conf [deleted file]
net/httptunnel/files/httptunnel.config [new file with mode: 0644]