[network-manager-applet: 5/5] applet: merge branch 'bg/vpn-state-rh1442782'

[Beniamino Galvani <bgalvani src gnome org>]

commit 84bf7d08cc3cf135d6f4c2956473d5ab23f30158
Merge: f68559c 0b5e384
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Thu Apr 20 18:37:32 2017 +0200

    applet: merge branch 'bg/vpn-state-rh1442782'
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1442782

 src/applet.c |  136 ++++++++++++++++++++++++---------------------------------
 1 files changed, 57 insertions(+), 79 deletions(-)
---