[packages_10.03.2] httptunnel: merge r29199, r29226
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 4 Feb 2012 20:01:22 +0000 (20:01 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 4 Feb 2012 20:01:22 +0000 (20:01 +0000)
commiteb57698573a5f5d44bf7bf988d50dae17161dff9
treeb0b0b4266755bab311124dc1058ea79ea0b3f78b
parenta47fc7d785ccc82f9d3be9ba29d35def5a623b08
[packages_10.03.2] httptunnel: merge r29199, r29226

SVN-Revision: 30098
net/httptunnel/Makefile
net/httptunnel/files/httptunnel.conf [deleted file]
net/httptunnel/files/httptunnel.config [new file with mode: 0644]