[network-manager-openvpn: 5/5] all: merge branch 'th/tls-remote-workaround-bgo776045'

[Thomas Haller <thaller src gnome org>]

commit 37d6dc4c521ebce71313e9ea757f90cd7eefc7d2
Merge: cfadfab 1c2986b
Author: Thomas Haller <thaller redhat com>
Date:   Wed Feb 15 14:05:50 2017 +0100

    all: merge branch 'th/tls-remote-workaround-bgo776045'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=776045
    https://bugzilla.redhat.com/show_bug.cgi?id=1421241

 properties/auth-helpers.c       |   14 +++-
 properties/import-export.c      |    2 +-
 properties/nm-openvpn-dialog.ui |    2 +
 src/nm-openvpn-service.c        |  154 ++++++++++++++++++++++++++++++---------
 4 files changed, 133 insertions(+), 39 deletions(-)
---