Merge branch 'vpn-psk-anyid'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Tue, 22 Dec 2009 14:09:09 +0000 (15:09 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Tue, 22 Dec 2009 14:09:09 +0000 (15:09 +0100)
commit7bcc6e82f761afea0c70d0c7d519545fc82642ca
tree1074a83cebe9d95bce69b371471231e897b0d736
parent59273f43310d83348682dfa08555aa5712679586
Merge branch 'vpn-psk-anyid'