[network-manager-applet: 7/7] merge: branch 'lr/team'

[Lubomir Rintel <lkundrak src gnome org>]

commit 89f4c102e9d1e0534822ffa3079f73c49218ba04
Merge: 4882b50 13eea21
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Jul 25 14:03:24 2016 +0200

    merge: branch 'lr/team'
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1079465

 configure.ac                                   |   38 +-
 src/8021x.ui                                   |    2 +-
 src/connection-editor/Makefile.am              |    2 +
 src/connection-editor/ce-ip4-routes.ui         |    2 +-
 src/connection-editor/ce-ip6-routes.ui         |    2 +-
 src/connection-editor/ce-new-connection.ui     |    2 +-
 src/connection-editor/ce-page-bluetooth.ui     |    2 +-
 src/connection-editor/ce-page-bond.ui          |    2 +-
 src/connection-editor/ce-page-bridge-port.ui   |    2 +-
 src/connection-editor/ce-page-bridge.ui        |    2 +-
 src/connection-editor/ce-page-dcb.ui           |    2 +-
 src/connection-editor/ce-page-dsl.ui           |    2 +-
 src/connection-editor/ce-page-ethernet.ui      |    2 +-
 src/connection-editor/ce-page-general.ui       |    2 +-
 src/connection-editor/ce-page-infiniband.ui    |    2 +-
 src/connection-editor/ce-page-ip4.ui           |    2 +-
 src/connection-editor/ce-page-ip6.ui           |    2 +-
 src/connection-editor/ce-page-mobile.ui        |    2 +-
 src/connection-editor/ce-page-ppp.ui           |    2 +-
 src/connection-editor/ce-page-team-port.ui     |  891 ++++++++++++++-
 src/connection-editor/ce-page-team.ui          | 1421 ++++++++++++++++++++++--
 src/connection-editor/ce-page-vlan.ui          |    2 +-
 src/connection-editor/ce-page-wifi-security.ui |    2 +-
 src/connection-editor/ce-page-wifi.ui          |    2 +-
 src/connection-editor/ce-page.c                |   61 +-
 src/connection-editor/ce-page.h                |    5 +-
 src/connection-editor/ce-ppp-auth-methods.ui   |    2 +-
 src/connection-editor/nm-connection-editor.ui  |    2 +-
 src/connection-editor/nm-connection-list.c     |    7 +-
 src/connection-editor/page-bond.c              |    4 +-
 src/connection-editor/page-ethernet.c          |    4 +-
 src/connection-editor/page-infiniband.c        |    4 +-
 src/connection-editor/page-team-port.c         |  528 +++++++++-
 src/connection-editor/page-team.c              |  835 +++++++++++++-
 src/connection-editor/page-vlan.c              |    4 +-
 src/connection-editor/page-wifi.c              |   13 +-
 src/gsm-unlock.ui                              |    2 +-
 src/info.ui                                    |    2 +-
 src/libnm-gtk/wifi.ui                          |    2 +-
 src/libnma/wifi.ui                             |    2 +-
 src/wireless-security/eap-method-fast.ui       |    2 +-
 src/wireless-security/eap-method-leap.ui       |    2 +-
 src/wireless-security/eap-method-peap.ui       |    2 +-
 src/wireless-security/eap-method-simple.ui     |    2 +-
 src/wireless-security/eap-method-tls.ui        |    2 +-
 src/wireless-security/eap-method-ttls.ui       |    2 +-
 src/wireless-security/ws-dynamic-wep.ui        |    2 +-
 src/wireless-security/ws-leap.ui               |    2 +-
 src/wireless-security/ws-wep-key.ui            |    2 +-
 src/wireless-security/ws-wpa-eap.ui            |    2 +-
 src/wireless-security/ws-wpa-psk.ui            |    2 +-
 51 files changed, 3648 insertions(+), 243 deletions(-)
---