[sagenb] 61/179: Merge branch 'master' into issue-98

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit a84ac429864bda2f001f5faad3b4584c19a2ed16
Merge: 17f17b7 f3e6e20
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Mon Mar 11 11:32:59 2013 +0100

    Merge branch 'master' into issue-98

 HACKING.rst                                        |  66 ++++++++++
 INSTALL.rst                                        |  57 +++-----
 flask_version/worksheet_listing.py                 |   5 +-
 .../data/sage/html/settings/account_settings.html  |   2 +-
 .../data/sage/html/settings/user_management.html   |  14 +-
 sagenb/misc/misc.py                                |   2 +-
 sagenb/misc/sphinxify.py                           |  24 +++-
 sagenb/misc/support.py                             |  16 ++-
 sagenb/notebook/auth.py                            | 146 +++++++++++++++++++++
 sagenb/notebook/conf.py                            |  11 ++
 sagenb/notebook/interact.py                        |   2 +
 sagenb/notebook/server_conf.py                     |  59 +++++++++
 sagenb/notebook/user.py                            |   9 +-
 sagenb/notebook/user_manager.py                    |  75 ++++++++++-
 setup.py                                           |   2 +-
 15 files changed, 426 insertions(+), 64 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git