[network-manager-fortisslvpn: 6/6] merge: branch 'lr/otp'

[Lubomir Rintel <lkundrak src gnome org>]

commit 4335f936720293fec7eebbdd6b4bbdae8a56b029
Merge: d434ad7 06b0043
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Jul 26 18:08:33 2017 +0200

    merge: branch 'lr/otp'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=777404

 Makefile.am                         |   10 -----
 auth-dialog/main.c                  |   69 ++++++++++++++++++++++++-----------
 contrib/fortiserve.pl               |    9 ++++-
 properties/nm-fortisslvpn-dialog.ui |   45 +++++++++++++++++++++--
 properties/nm-fortisslvpn-editor.c  |   25 ++++++++++++-
 shared/nm-service-defines.h         |    3 +-
 src/nm-fortisslvpn-service.c        |   44 ++++++++++++++---------
 7 files changed, 150 insertions(+), 55 deletions(-)
---