From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 20 Jan 2017 10:55:48 +0000 (+0100)
Subject: Merge branch 'android-import'
X-Git-Tag: 5.5.2dr5~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=343a5e9f26264623032ef65c2149a1678b0c4f87;p=thirdparty%2Fstrongswan.git

Merge branch 'android-import'

Adds a VPN profile import feature.
---

343a5e9f26264623032ef65c2149a1678b0c4f87