[network-manager-openvpn: 8/8] merge: branch 'lr/multiple-vpn'

[Lubomir Rintel <lkundrak src gnome org>]

commit c6b7293c9ee9051b84d7051c1da946a1d5a64184
Merge: 55fe222 3ea0104
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Nov 3 15:53:19 2015 +0100

    merge: branch 'lr/multiple-vpn'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753965

 auth-dialog/main.c                      |    4 +-
 nm-openvpn-service.conf                 |    4 +-
 nm-openvpn-service.name.in              |    1 +
 properties/import-export.c              |    2 +-
 properties/nm-openvpn.c                 |    4 +-
 src/nm-openvpn-service-defines.h        |    2 +
 src/nm-openvpn-service-openvpn-helper.c |   15 ++++-
 src/nm-openvpn-service.c                |   94 ++++++++++++++++++-------------
 src/nm-openvpn-service.h                |    2 +-
 9 files changed, 78 insertions(+), 50 deletions(-)
---