[network-manager-vpnc: 9/9] service: merge branch 'th/vpn-plugin-debug-bgo766872'

[Thomas Haller <thaller src gnome org>]

commit 71b299034e33e5efbce24cfba09b9ca3c3b0d1d3
Merge: f5cbfd3 8f46276
Author: Thomas Haller <thaller redhat com>
Date:   Thu May 26 11:43:55 2016 +0200

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

 shared/Makefile.am                   |    3 +-
 shared/README                        |    1 +
 shared/nm-vpn/nm-vpn-plugin-macros.h |   43 ++++++++
 src/Makefile.am                      |   11 ++-
 src/nm-vpnc-service-vpnc-helper.c    |   70 ++++++++++--
 src/nm-vpnc-service.c                |  198 +++++++++++++++++++++++-----------
 6 files changed, 250 insertions(+), 76 deletions(-)
---