[network-manager-applet: 6/6] merge: branch 'bg/wireless-security-leaks-bgo750261'

[Beniamino Galvani <bgalvani src gnome org>]

commit 2ab0d34497cabe35a350ee72c46266c8046fffea
Merge: ec1a47c a1c9135
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Tue Jan 3 15:47:15 2017 +0100

    merge: branch 'bg/wireless-security-leaks-bgo750261'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=750261

 src/libnma/nma-ui-utils.c                 |    7 ++++---
 src/libnma/nma-wifi-dialog.c              |    3 +++
 src/wireless-security/eap-method-leap.c   |   14 +++++---------
 src/wireless-security/eap-method-simple.c |   25 +++++++------------------
 4 files changed, 19 insertions(+), 30 deletions(-)
---