[network-manager-openvpn: 7/7] service: merge branch 'th/vpn-plugin-debug-bgo766816'

[Thomas Haller <thaller src gnome org>]

commit 0a8fa06d5e953f402585051717cfb7f2ce441c4c
Merge: 17b41f1 f91c336
Author: Thomas Haller <thaller redhat com>
Date:   Tue May 24 22:45:31 2016 +0200

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

 shared/utils.h                          |   17 ++++
 src/Makefile.am                         |   16 +++-
 src/nm-openvpn-service-openvpn-helper.c |  108 +++++++++++++++++---------
 src/nm-openvpn-service.c                |  125 ++++++++++++++++++++-----------
 4 files changed, 182 insertions(+), 84 deletions(-)
---