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

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

commit 8122f9572b759543a7479d01af58e60582ead2b4
Merge: 351e176 7218809
Author: Jenkins <jenkins endlessm com>
Date:   Wed Sep 24 23:30:02 2014 -0700

    Merge branch 'master' for Release_2.1.7-rc5

 .gitignore                                         |    3 +-
 Makefile.am                                        |    2 +-
 configure.ac                                       |    3 -
 data/Makefile.am                                   |   14 --
 data/gnome-welcome-tour.desktop.in.in              |    6 -
 data/gnome-welcome-tour.in                         |   18 --
 gnome-initial-setup/gis-assistant.c                |   16 ++-
 gnome-initial-setup/gis-driver.c                   |    5 +
 gnome-initial-setup/gis-page.c                     |   28 +++
 gnome-initial-setup/gis-page.h                     |    2 +
 gnome-initial-setup/gis-window.c                   |    9 +-
 .../gnome-initial-setup-copy-worker.c              |    1 -
 gnome-initial-setup/pages/account/um-utils.c       |   24 +++
 .../pages/endless-eula/gis-endless-eula-page.c     |   19 +--
 .../pages/endless-eula/gis-endless-eula-page.ui    |   17 --
 .../pages/network/gis-network-page.c               |    7 -
 .../pages/network/gis-network-page.ui              |   18 +--
 gnome-initial-setup/pages/summary/Makefile.am      |   12 ++-
 .../pages/summary/com.endlessm.FBE.xml             |    7 +
 .../pages/summary/gis-summary-page.c               |  101 ++++++++++-
 player/Makefile.am                                 |    6 -
 player/player.c                                    |  187 --------------------
 22 files changed, 198 insertions(+), 307 deletions(-)
---