[network-manager-applet: 5/5] editor: merge branch 'bg/unsupported-properties-bgo777225'

[Beniamino Galvani <bgalvani src gnome org>]

commit 2e3d3351a7208aba55954b2ad25b83843f4c6af7
Merge: ecdb1fe e3a81d3
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Thu Feb 2 13:59:24 2017 +0100

    editor: merge branch 'bg/unsupported-properties-bgo777225'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=777225

 src/connection-editor/ce-page.c               |    9 ++-
 src/connection-editor/ce-page.h               |    2 +-
 src/connection-editor/nm-connection-editor.c  |   63 +++++++++++++++++++++++++
 src/connection-editor/nm-connection-editor.h  |    6 ++
 src/connection-editor/nm-connection-editor.ui |   13 +++++
 src/connection-editor/page-ethernet.c         |    3 +-
 src/connection-editor/page-ip-tunnel.c        |    2 -
 src/connection-editor/page-vlan.c             |    3 +-
 src/connection-editor/page-wifi-security.c    |   51 ++++++++++++++++++++
 src/connection-editor/page-wifi.c             |    3 +-
 10 files changed, 146 insertions(+), 9 deletions(-)
---