[gnome-initial-setup/shell/4765: 254/362] Merge branch 'master' for Release_2.1.7-rc13

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

commit 75b7ec04a47663b2275e73a9e12a61de44969c6b
Merge: 8122f95 4a72b3e
Author: Jenkins <jenkins endlessm com>
Date:   Tue Sep 30 20:32:13 2014 -0700

    Merge branch 'master' for Release_2.1.7-rc13

 .../pages/endless-eula/gis-endless-eula-page.c     |    2 +-
 po/ar.po                                           |   64 ++++++++++----------
 po/es.po                                           |   66 ++++++++++----------
 po/fr.po                                           |   64 ++++++++++----------
 po/gnome-initial-setup.pot                         |   62 +++++++++---------
 po/pt_BR.po                                        |   64 ++++++++++----------
 6 files changed, 161 insertions(+), 161 deletions(-)
---