[network-manager-applet: 3/3] libnma: merge branch 'th/password-storage-in-ask-mode-bgo775769'

[Thomas Haller <thaller src gnome org>]

commit 5018f91499f0bae365c9b69f5be5435e46a92627
Merge: ebaebdd ac2adab
Author: Thomas Haller <thaller redhat com>
Date:   Fri Dec 16 14:48:41 2016 +0100

    libnma: merge branch 'th/password-storage-in-ask-mode-bgo775769'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=775769

 src/libnm-gtk/nm-ui-utils.c |   25 +++++++++++++++++--------
 src/libnm-gtk/nm-ui-utils.h |    2 +-
 src/libnma/nma-ui-utils.c   |   25 +++++++++++++++++--------
 src/libnma/nma-ui-utils.h   |    2 +-
 4 files changed, 36 insertions(+), 18 deletions(-)
---