[network-manager-libreswan: 21/21] merge branch 'th/vpn-plugin-debug-bgo766872'

[Thomas Haller <thaller src gnome org>]

commit de704fcc060ef4f0dcced7668a2b15ebc3bf596c
Merge: e24b4b7 a8ad1ba
Author: Thomas Haller <thaller redhat com>
Date:   Wed Jun 15 13:56:22 2016 +0200

    merge branch 'th/vpn-plugin-debug-bgo766872'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=766872

 configure.ac                            |   16 ++
 po/POTFILES.in                          |    1 +
 properties/nm-libreswan-editor-plugin.c |   78 ++++++-
 shared/Makefile.am                      |    3 +-
 shared/README                           |    1 +
 shared/nm-default.h                     |    5 +
 shared/nm-vpn/nm-vpn-plugin-macros.h    |   43 ++++
 shared/utils.c                          |  210 ++++++++--------
 shared/utils.h                          |   39 ++--
 src/Makefile.am                         |    2 +-
 src/nm-libreswan-service-helper.c       |   63 ++++-
 src/nm-libreswan-service.c              |  421 ++++++++++++++++++-------------
 12 files changed, 561 insertions(+), 321 deletions(-)
---