[NetworkManager-libreswan: 8/8] merge: branch 'fg/GUI_IKEv2_advanced_options'

[Francesco Giudici <fgiudici src gnome org>]

commit 6b6c9635c701e3e7c3e119d4ff04826c34948df2
Merge: 94bc845 25be53e
Author: Francesco Giudici <fgiudici redhat com>
Date:   Mon Sep 17 17:12:10 2018 +0200

    merge: branch 'fg/GUI_IKEv2_advanced_options'

 Makefile.am                           |    3 +-
 man/nm-settings-libreswan.5.in        |    3 +-
 properties/nm-libreswan-dialog.ui     |  588 ++++++++---
 properties/nm-libreswan-editor.c      |  340 ++++---
 shared/nm-default.h                   |    2 -
 shared/nm-utils/gsystem-local-alloc.h |  208 ----
 shared/nm-utils/nm-glib.h             |  112 ++-
 shared/nm-utils/nm-macros-internal.h  |  880 ++++++++++++++---
 shared/nm-utils/nm-shared-utils.c     | 1717 ++++++++++++++++++++++++++++++++-
 shared/nm-utils/nm-shared-utils.h     |  747 +++++++++++++-
 shared/utils.c                        |   24 +-
 11 files changed, 3988 insertions(+), 636 deletions(-)
---