[network-manager-applet: 8/8] applet: merge branch 'th/applet-icon-crash-bgo762421'

[Thomas Haller <thaller src gnome org>]

commit 65a594c0491fa1d0d27b6746222a8890fd04614a
Merge: 882bf55 e1075ee
Author: Thomas Haller <thaller redhat com>
Date:   Mon Feb 29 20:28:51 2016 +0100

    applet: merge branch 'th/applet-icon-crash-bgo762421'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=762421

 src/applet.c |   92 ++++++++++++++++++++++++++-------------------------------
 1 files changed, 42 insertions(+), 50 deletions(-)
---