Merge branch 'nm-psk'
authorTobias Brunner <tobias@strongswan.org>
Wed, 27 Nov 2013 17:37:11 +0000 (18:37 +0100)
committerTobias Brunner <tobias@strongswan.org>
Wed, 27 Nov 2013 17:37:11 +0000 (18:37 +0100)
This adds support for PSK authentication to the NetworkManager frontend.


Trivial merge