[network-manager-openvpn: 14/14] all: merge branch 'th/extra-certs-and-cleanup'

[Thomas Haller <thaller src gnome org>]

commit 9a947755780f40efec6e5e0ee386f9602d8ea126
Merge: fb5c800 e0b0f9f
Author: Thomas Haller <thaller redhat com>
Date:   Wed Mar 7 19:09:12 2018 +0100

    all: merge branch 'th/extra-certs-and-cleanup'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=793746

 properties/import-export.c      |   83 ++--
 properties/nm-openvpn-dialog.ui |   32 ++-
 properties/nm-openvpn-editor.c  |   59 ++-
 shared/nm-service-defines.h     |   41 +-
 shared/utils.h                  |   15 +-
 src/nm-openvpn-service.c        |  974 +++++++++++++++++++--------------------
 6 files changed, 615 insertions(+), 589 deletions(-)
---