[network-manager-applet: 3/3] editor: merge branch 'bg/device-empty-mac-rh1380424'

[Beniamino Galvani <bgalvani src gnome org>]

commit 48dd344d2321226fa5570ba6d8da5751e925ba8f
Merge: 2ab0d34 de10ae4
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Wed Jan 4 11:43:16 2017 +0100

    editor: merge branch 'bg/device-empty-mac-rh1380424'
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1380424

 src/connection-editor/ce-page.c         |   27 +++++++++++++--------------
 src/connection-editor/ce-page.h         |    3 +--
 src/connection-editor/page-bluetooth.c  |    2 +-
 src/connection-editor/page-ethernet.c   |    2 +-
 src/connection-editor/page-infiniband.c |    2 +-
 src/connection-editor/page-ip-tunnel.c  |    2 +-
 src/connection-editor/page-wifi.c       |    2 +-
 7 files changed, 19 insertions(+), 21 deletions(-)
---