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)
commite9b49d412b3f226ac4701cb1e9525b77f4693f82
tree0eb3a2d35a999c29dfa9a1aa896eb545c5b54cb0
parent228db0433d9e8dd11bb70992e4711e099567ae4d
parent0b506edb1901aefd4fca35c51f985e7e93bbaf6e
Merge branch 'nm-psk'

This adds support for PSK authentication to the NetworkManager frontend.