[gnome-initial-setup/shell/4765: 87/362] Merge branch 'master' for Release_2.0.3-rc4

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

commit cb73f44c5b46ea3e42b2ab7c7f0dbe14018b57e4
Merge: 7e46d91 7164228
Author: Jenkins <jenkins endlessm com>
Date:   Fri Jul 11 22:12:55 2014 -0700

    Merge branch 'master' for Release_2.0.3-rc4

 gnome-initial-setup/gis-assistant.c                |    2 ++
 .../pages/account/gis-account-page.ui              |    2 +-
 .../pages/location/cc-timezone-monitor.c           |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
---