[gnome-initial-setup/shell/4765: 30/362] Merge pull request #2 from endlessm/shell/2397

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

commit 6674dc14bda6cf8dfda6a57db23aec3feb55126c
Merge: bcfc8a0 9aa6f43
Author: Roddy Shuler <roddy endlessm com>
Date:   Fri May 2 09:44:41 2014 -0700

    Merge pull request #2 from endlessm/shell/2397
    
    Hide Enterprise Login button

 gnome-initial-setup/gis-assistant.c                |   19 ++++++++++
 gnome-initial-setup/gis-page.c                     |    8 ++++
 gnome-initial-setup/gis-page.h                     |    2 +
 .../pages/account/gis-account-page.c               |   36 ++++++++++++++-----
 .../pages/account/gis-account-page.ui              |    2 +-
 5 files changed, 56 insertions(+), 11 deletions(-)
---