[network-manager-openvpn: 5/5] properties: merge branch 'import-inline-tls-auth' (bgo#760904)

[Thomas Haller <thaller src gnome org>]

commit ad3d639e1d1d8b10fef022f1d19a4b4ce03a0382
Merge: cb674e9 5f8e54f
Author: Thomas Haller <thaller redhat com>
Date:   Sat Jan 23 17:18:29 2016 +0100

    properties: merge branch 'import-inline-tls-auth' (bgo#760904)
    
    https://bugzilla.gnome.org/show_bug.cgi?id=760904
    https://mail.gnome.org/archives/networkmanager-list/2016-January/msg00028.html

 properties/import-export.c                |   34 ++++++-
 properties/tests/conf/tls-inline-ca.pem   |   18 ++++
 properties/tests/conf/tls-inline-cert.pem |   22 +++++
 properties/tests/conf/tls-inline-key.pem  |   51 ++++++++++
 properties/tests/conf/tls-inline-ta.pem   |   18 ++++
 properties/tests/conf/tls-inline.ovpn     |  146 +++++++++++++++++++++++++++++
 properties/tests/test-import-export.c     |   89 +++++++++++++++++
 7 files changed, 374 insertions(+), 4 deletions(-)
---