Merge branch 'android-import'
authorTobias Brunner <tobias@strongswan.org>
Fri, 20 Jan 2017 10:55:48 +0000 (11:55 +0100)
committerTobias Brunner <tobias@strongswan.org>
Fri, 20 Jan 2017 10:55:48 +0000 (11:55 +0100)
Adds a VPN profile import feature.


Trivial merge