[network-manager-openvpn: 25/25] properties: merge branch 'th/ovpn-import-bgo761285'

[Thomas Haller <thaller src gnome org>]

commit ae03f40e32a4d2f63f01eb423a757359618e6173
Merge: 25ed576 1eaed4f
Author: Thomas Haller <thaller redhat com>
Date:   Wed Feb 10 00:27:42 2016 +0100

    properties: merge branch 'th/ovpn-import-bgo761285'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=761285

 .gitattributes                          |    2 +
 configure.ac                            |   13 +
 properties/import-export.c              | 1921 +++++++++++++++++--------------
 properties/import-export.h              |    7 +
 properties/tests/conf/tls-inline-ca.pem |  Bin 1090 -> 1146 bytes
 properties/tests/conf/tls-inline-ta.pem |    3 +
 properties/tests/conf/tls-inline.ovpn   |  Bin 6642 -> 6643 bytes
 properties/tests/test-import-export.c   | 1318 ++++++++++-----------
 shared/nm-default.h                     |    4 +
 shared/nm-test-utils.h                  | 1824 +++++++++++++++++++++++++++++-
 shared/utils.c                          |   79 ++
 shared/utils.h                          |    2 +
 12 files changed, 3616 insertions(+), 1557 deletions(-)
---