[network-manager-libreswan: 6/6] merge: branch 'lr/main-mode'

[Lubomir Rintel <lkundrak src gnome org>]

commit a220e0282233f1cbfb39fe11bd5db89119a55b3a
Merge: e1ce35a d942f39
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Jan 25 16:52:39 2016 +0100

    merge: branch 'lr/main-mode'

 common/utils.c             |   13 ++++++++++---
 properties/nm-libreswan.c  |   20 +++++---------------
 src/nm-libreswan-service.c |   11 ++++++++---
 3 files changed, 23 insertions(+), 21 deletions(-)
---