[network-manager-openvpn: 3/3] merge: fixes for import/export code (rh #1194643)

[Jiří Klimeš <jklimes src gnome org>]

commit 211a99ec49d08b69af75be44a4adc7a7b76126ad
Merge: 31f264a e6d9c33
Author: Jiří Klimeš <jklimes redhat com>
Date:   Tue May 26 09:39:57 2015 +0200

    merge: fixes for import/export code (rh #1194643)
    
    - handle protocol in 'remote' option (e.g.: remote myserver.com 4444 tcp)
      'proto', 'rport' and 'port' are now default options for those gateways
      missing port or protocol.
    - handle 'remote-random' option
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1194643

 properties/import-export.c      |   98 +++++++++++++++++++++++++++++++--------
 properties/nm-openvpn-dialog.ui |    5 +-
 2 files changed, 82 insertions(+), 21 deletions(-)
---