[gnome-initial-setup/shell/4765: 102/362] Merge pull request #24 from endlessm/shell/2901

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

commit afff48a2bdc725e14b9f29de72ef0e4072e134ac
Merge: fe7723d 7fdeed2
Author: Roddy Shuler <roddy endlessm com>
Date:   Tue Jul 15 21:31:29 2014 -0700

    Merge pull request #24 from endlessm/shell/2901
    
    Shell/2901

 configure.ac                                       |    4 +-
 data/gnome-initial-setup-copy-worker.desktop.in.in |    2 +-
 data/initial-setup.json                            |    2 +-
 gnome-initial-setup/Makefile.am                    |    5 +-
 gnome-initial-setup/gis-keyring.c                  |  124 ++++++++++++++++++++
 gnome-initial-setup/gis-keyring.h                  |   36 ++++++
 gnome-initial-setup/gnome-initial-setup.c          |    1 +
 gnome-initial-setup/gnome-initial-setup.h          |    1 +
 .../pages/account/gis-account-page.c               |   10 ++-
 9 files changed, 178 insertions(+), 7 deletions(-)
---