[network-manager-openvpn: 10/10] properties: merge branch 'th/import-cleanup-bgo760987' (bgo#760987)

[Thomas Haller <thaller src gnome org>]

commit d875e81df1138e0e18c2c07d958770d38c798b9a
Merge: ad3d639 8d4fa90
Author: Thomas Haller <thaller redhat com>
Date:   Sat Jan 23 17:31:38 2016 +0100

    properties: merge branch 'th/import-cleanup-bgo760987' (bgo#760987)
    
    https://bugzilla.gnome.org/show_bug.cgi?id=760987

 .gitignore                 |    6 ++
 properties/import-export.c |  174 +++++++++++++++++++++++++++-----------------
 properties/import-export.h |    2 +-
 properties/nm-openvpn.c    |    5 +-
 4 files changed, 116 insertions(+), 71 deletions(-)
---