[NetworkManager-libreswan: 4/4] merge: branch 'fg/fix_conn_import-rh1633174'

[Francesco Giudici <fgiudici src gnome org>]

commit 8a369386aebd2689fefc1508e3d117c141d05a79
Merge: c3e82b7 b6bf734
Author: Francesco Giudici <fgiudici redhat com>
Date:   Tue Oct 9 09:56:37 2018 +0200

    merge: branch 'fg/fix_conn_import-rh1633174'
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1633174
    https://gitlab.gnome.org/GNOME/NetworkManager-libreswan/merge_requests/10

 properties/nm-libreswan-editor-plugin.c | 158 ++++++++++++++++++++++++++++----
 shared/nm-service-defines.h             |   4 +
 shared/utils.c                          |  26 +++---
 3 files changed, 156 insertions(+), 32 deletions(-)
---