[gnome-initial-setup/shell/4765: 167/362] Merge pull request #37 from endlessm/shell/3385

[Jasper St. Pierre <jstpierre src gnome org>]

commit 8b5d252c339a33482d7fa1f9fb1b8a9d512fffb0
Merge: da4505f e3d4343
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Thu Aug 21 17:07:34 2014 +0100

    Merge pull request #37 from endlessm/shell/3385
    
    network: don't make button sensitive when connected through other means

 .../pages/network/gis-network-page.c               |   56 ++++++++++++--------
 1 files changed, 33 insertions(+), 23 deletions(-)
---