[gnome-initial-setup/shell/4765: 106/362] Merge pull request #25 from endlessm/shell/3133

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

commit aee1bb9938a7abb9bbe0cad4f10e8da0eda55e19
Merge: 419c910 15d529a
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jul 21 09:37:24 2014 -0700

    Merge pull request #25 from endlessm/shell/3133
    
    Set time format based on personality

 gnome-initial-setup/gis-driver.c                   |   14 +++
 gnome-initial-setup/gis-driver.h                   |    2 +
 .../pages/location/gis-location-page.c             |   21 +++-
 .../pages/location/gis-location-page.ui            |  114 ++++++++++++--------
 4 files changed, 103 insertions(+), 48 deletions(-)
---