[network-manager-openvpn: 6/6] service: merge branch 'th/handle-child-process-bgo761299'

[Thomas Haller <thaller src gnome org>]

commit 25ed57678db82b8d268021712e75dc9988428e27
Merge: e4696f5 c933de1
Author: Thomas Haller <thaller redhat com>
Date:   Tue Feb 2 17:51:52 2016 +0100

    service: merge branch 'th/handle-child-process-bgo761299'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=761299

 src/nm-openvpn-service.c |  355 +++++++++++++++++++++++++++++++---------------
 1 files changed, 241 insertions(+), 114 deletions(-)
---