[gnome-initial-setup/shell/4765: 334/362] Merge pull request #81 from endlessm/shell/4558

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

commit be1ee05f7eeee2394b488f132129008b0fe23bf6
Merge: 83c20c6 e956e5a
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Feb 6 14:45:54 2015 -0800

    Merge pull request #81 from endlessm/shell/4558
    
    Get time format from locale instead of personality file

 gnome-initial-setup/gis-driver.c                   |   15 +-----------
 gnome-initial-setup/gis-driver.h                   |    2 -
 .../pages/language/gis-language-page.c             |    1 +
 .../pages/location/gis-location-page.c             |   25 +++++++++++++++++--
 4 files changed, 24 insertions(+), 19 deletions(-)
---