[network-manager-libreswan: 9/9] merge: branch 'lr/multiple-vpn'

[Lubomir Rintel <lkundrak src gnome org>]

commit 5648085ec6f9dc15fe820393207b36bc1e01f74d
Merge: c8c0080 ab3b309
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Nov 16 16:19:20 2015 +0100

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

 .gitignore                          |    2 +
 configure.ac                        |    2 +-
 nm-libreswan-service.conf           |    5 +-
 nm-libreswan-service.name.in        |    1 +
 src/Makefile.am                     |   25 ++-
 src/nm-libreswan-helper-service.xml |    9 +
 src/nm-libreswan-service-helper.c   |  413 +++---------------------
 src/nm-libreswan-service.c          |  615 +++++++++++++++++++++++++++++++----
 src/nm-libreswan-service.h          |    7 +-
 9 files changed, 644 insertions(+), 435 deletions(-)
---