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)
commit343a5e9f26264623032ef65c2149a1678b0c4f87
tree6fb6890750a7c0f44739dd1d3c9a994e755a5c26
parenta4c7778086c969cdd134730cbbb7ed307814d92b
parent7b73cf4aa9057170752134b8267dec70eb36a3ff
Merge branch 'android-import'

Adds a VPN profile import feature.