[network-manager-openvpn: 7/7] merge branch 'th/ping-bgo651657'

[Thomas Haller <thaller src gnome org>]

commit f5927b16ea9f08e2c5a70117f2b29a84c90ab36b
Merge: 4bb9236 bfb7388
Author: Thomas Haller <thaller redhat com>
Date:   Mon Aug 17 16:44:52 2015 +0200

    merge branch 'th/ping-bgo651657'
    
    Add support for the options --ping, --ping-exit, --ping-restart
    and --keepalive. Import/export is supported, UI integration (properties
    plugin) is still to-do.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=651657

 properties/import-export.c                   |  111 ++++++++++++++++++++++++++
 properties/tests/conf/keepalive.ovpn         |   25 ++++++
 properties/tests/conf/ping-with-exit.ovpn    |   26 ++++++
 properties/tests/conf/ping-with-restart.ovpn |   26 ++++++
 properties/tests/test-import-export.c        |   41 ++++++++++
 src/nm-openvpn-service-defines.h             |    3 +
 src/nm-openvpn-service.c                     |   43 ++++++++++
 7 files changed, 275 insertions(+), 0 deletions(-)
---