httptunnel: merge r29199, r29226
authorJo-Philipp Wich <[email protected]>
Sat, 4 Feb 2012 20:01:22 +0000 (20:01 +0000)
committerJo-Philipp Wich <[email protected]>
Sat, 4 Feb 2012 20:01:22 +0000 (20:01 +0000)
commitb05df247262954198b78feed146ced6f7c38c2c4
tree45bcbe92fdd84ef6cef6a17ff8b873952c11d633
parent22d5c5f3fc10361de276e6758a9041dbc1069902
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]