Merge remote branch 'origin/iphone-vpn' into update-522
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Sat, 12 Dec 2009 18:02:53 +0000 (19:02 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Sat, 12 Dec 2009 18:02:53 +0000 (19:02 +0100)
commitd14f120765d727a67204bd7764e2bf76b4c67d5c
tree1074a83cebe9d95bce69b371471231e897b0d736
parented35743ac73331abe0d2e159cacc702847bbb057
Merge remote branch 'origin/iphone-vpn' into update-522