[packages_10.03.2] ptunnel: merge r29098, r29228
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 5 Feb 2012 15:57:49 +0000 (15:57 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 5 Feb 2012 15:57:49 +0000 (15:57 +0000)
commitb1113156365e0d4eb21b8ef163faf759cc707353
tree6b214e69d50458cc8b5f38506d1c5fd9abb4f97b
parentf1c09423dd842756f03f56aba1fa344bce033d08
[packages_10.03.2] ptunnel: merge r29098, r29228

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