[network-manager-openvpn: 6/6] Merge branch 'th/bgo556134_up_restart'

[Thomas Haller <thaller src gnome org>]

commit cefb89ccfb1732391e30512ed524a398320d3d56
Merge: 7f37796 62d535c
Author: Thomas Haller <thaller redhat com>
Date:   Wed Apr 23 10:25:29 2014 +0200

    Merge branch 'th/bgo556134_up_restart'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=556134
    
    Signed-off-by: Thomas Haller <thaller redhat com>

 src/Makefile.am                         |    1 +
 src/nm-openvpn-service-openvpn-helper.c |   68 ++++++++++++++++++++++++++-----
 src/nm-openvpn-service.c                |   16 ++++----
 3 files changed, 66 insertions(+), 19 deletions(-)
---