Merge branch 'iphone-vpn' into update-522
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Mon, 14 Dec 2009 10:31:39 +0000 (11:31 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Mon, 14 Dec 2009 10:31:39 +0000 (11:31 +0100)
commitd6b177f6f7e19ff42cea87638d4e0452720d0f95
tree1074a83cebe9d95bce69b371471231e897b0d736
parent7e58ddf432c9aae11846b5c7d7a7856ba3de0437
parented35743ac73331abe0d2e159cacc702847bbb057
Merge branch 'iphone-vpn' into update-522