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

[Beniamino Galvani <bgalvani src gnome org>]

commit f91c4807c283d9e5e15dd9e88142e3b33e2e9e95
Merge: 3a378db 887c44b
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Wed Jan 20 10:17:29 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 |   69 ++++++++++++++++++++++++++++++++++++++-----
 properties/import-export.h |    2 +-
 properties/nm-openvpn.c    |   32 +-------------------
 3 files changed, 63 insertions(+), 40 deletions(-)
---