merge r27669
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 17 Jul 2011 22:43:05 +0000 (22:43 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 17 Jul 2011 22:43:05 +0000 (22:43 +0000)
commit27376ef7e899eae6f0a3f1acedfe152a0e40ac3c
tree51b4eadbdcc3a24cecbcdb3a2233d49d8a054438
parentc61de29b1903b530f7dd1e920ff6390d49b084a1
merge r27669

SVN-Revision: 27670
package/pptp/Makefile
package/pptp/files/pptp.sh