[network-manager-vpnc: 6/6] service: merge branch 'th/multiple-vpn-support'

[Thomas Haller <thaller src gnome org>]

commit f966427abb3e350026a41827b629cd27252422ae
Merge: 8c8818a e2ff0e6
Author: Thomas Haller <thaller redhat com>
Date:   Tue May 17 19:13:29 2016 +0200

    service: merge branch 'th/multiple-vpn-support'

 nm-vpnc-service.conf              |    4 +-
 nm-vpnc-service.name.in           |    1 +
 src/nm-vpnc-service-vpnc-helper.c |   26 +++++++++++++++++------
 src/nm-vpnc-service.c             |   41 ++++++++++++++++++++++++++++++------
 src/nm-vpnc-service.h             |    2 +-
 5 files changed, 57 insertions(+), 17 deletions(-)
---