Merge branch 'iphone-vpn' into update-522
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Sat, 12 Dec 2009 18:46:24 +0000 (19:46 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Sat, 12 Dec 2009 18:46:24 +0000 (19:46 +0100)
commit7e58ddf432c9aae11846b5c7d7a7856ba3de0437
tree1074a83cebe9d95bce69b371471231e897b0d736
parentd14f120765d727a67204bd7764e2bf76b4c67d5c
parented35743ac73331abe0d2e159cacc702847bbb057
Merge branch 'iphone-vpn' into update-522