[gnome-initial-setup/shell/4765: 216/362] Merge branch 'master' for Release_2.1.6-rc1

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

commit 4aaf5bd91ab9a1ccddf2af5b4ce50d1d198eafa8
Merge: a9fe178 df517d0
Author: Jenkins <jenkins endlessm com>
Date:   Fri Sep 12 17:24:49 2014 -0700

    Merge branch 'master' for Release_2.1.6-rc1

 .../pages/account/gis-account-page.c               |   29 ++++--
 .../pages/account/gis-account-page.ui              |    7 +-
 gnome-initial-setup/pages/account/um-utils.c       |   92 ++++++++++++--------
 .../pages/display/gis-display-page.c               |   24 +++++
 .../pages/location/gis-location-page.c             |    7 ++
 .../pages/network/gis-network-page.c               |   41 ++++++---
 po/ar.po                                           |    8 +-
 po/fr.po                                           |    8 +-
 po/pt_BR.po                                        |   10 +-
 9 files changed, 148 insertions(+), 78 deletions(-)
---