[network-manager-openvpn/nm-1-0: 4/4] merge: branch 'bg/inline-cert-fixes-bgo760746'

[Beniamino Galvani <bgalvani src gnome org>]

commit dab12e274aa5cf995b45139f462c6cc05bb6dce3
Merge: 90489e9 ff54cd5
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Wed Jan 20 10:51:17 2016 +0100

    merge: branch 'bg/inline-cert-fixes-bgo760746'
    
    Improve import of inline certificates and keys.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=760746

 properties/import-export.c |   66 ++++++++++++++++++++++++++++++++++++++-----
 properties/import-export.h |    2 +-
 properties/nm-openvpn.c    |   30 +-------------------
 3 files changed, 60 insertions(+), 38 deletions(-)
---