[network-manager-applet: 2/2] merge: branch 'lr/selinux'

[Lubomir Rintel <lkundrak src gnome org>]

commit f6444414a53e8f25becb025f7a9021d3f54921b7
Merge: 174c00c 963a89c
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Mar 24 15:31:07 2017 +0100

    merge: branch 'lr/selinux'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=777054

 Makefile.am                                   |    4 +-
 configure.ac                                  |   12 ++
 src/connection-editor/nm-connection-editor.c  |  176 +++++++++++++++++++-
 src/connection-editor/nm-connection-editor.h  |    4 +
 src/connection-editor/nm-connection-editor.ui |  221 ++++++++++++++++++++++++-
 5 files changed, 414 insertions(+), 3 deletions(-)
---