[network-manager-openconnect: 4/4] merge branch 'th/vpn-service-info-bgo767197'

[Thomas Haller <thaller src gnome org>]

commit 4215786f5b92dd461fc3c82c3bd7bb975f84c892
Merge: 8ea72f6 93a807a
Author: Thomas Haller <thaller redhat com>
Date:   Wed Jun 15 15:09:34 2016 +0200

    merge branch 'th/vpn-service-info-bgo767197'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=767197

 Makefile.am                                 |    2 +-
 configure.ac                                |   15 +-
 nm-openconnect-service.name.in              |    4 +-
 properties/Makefile.am                      |    1 +
 properties/nm-openconnect.c                 |  132 ++++++
 shared/Makefile.am                          |    5 +
 shared/nm-utils/gsystem-local-alloc.h       |  208 +++++++++
 shared/nm-utils/nm-macros-internal.h        |  604 +++++++++++++++++++++++++++
 shared/nm-utils/nm-vpn-editor-plugin-call.h |  189 +++++++++
 src/nm-openconnect-service-defines.h        |    1 +
 src/nm-openconnect-service.c                |   14 +-
 11 files changed, 1158 insertions(+), 17 deletions(-)
---