[network-manager-applet: 3/3] applet: merge branch 'th/vpn-auth-dialog-bgo765329'

[Thomas Haller <thaller src gnome org>]

commit 762f7ddea1749bae096f2e9442db29ce4da5b14a
Merge: df0583a 997111f
Author: Thomas Haller <thaller redhat com>
Date:   Fri Apr 22 14:24:25 2016 +0200

    applet: merge branch 'th/vpn-auth-dialog-bgo765329'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765329

 src/Makefile.am           |    1 -
 src/applet-vpn-request.c  |   59 ++++++--------------------------------------
 src/libnm-gtk/Makefile.am |    1 -
 src/libnma/Makefile.am    |    1 -
 4 files changed, 8 insertions(+), 54 deletions(-)
---