[network-manager-openconnect: 5/6] merge: branch 'lr/multiple-vpn'

[Lubomir Rintel <lkundrak src gnome org>]

commit 41cb8383c16c7fe776f010f2505a8a2abd54afcb
Merge: 234b995 f5a5d00
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Oct 23 16:46:14 2015 +0200

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

 auth-dialog/main.c                              |    4 ++--
 nm-openconnect-service.conf                     |    7 ++++---
 nm-openconnect-service.name.in                  |    1 +
 properties/nm-openconnect.c                     |    6 +++---
 src/nm-openconnect-service-defines.h            |    2 ++
 src/nm-openconnect-service-openconnect-helper.c |    7 ++++++-
 src/nm-openconnect-service.c                    |   15 +++++++++------
 src/nm-openconnect-service.h                    |    2 +-
 8 files changed, 28 insertions(+), 16 deletions(-)
---