[sagenb] 06/157: Merge tag '0.10.5' into release

[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 4b8e6a633703c451d75efa2b6e00fdead2714f12
Merge: d4e0164 c1a3c09
Author: Keshav Kini <keshav.kini at gmail.com>
Date:   Sat Apr 27 19:52:24 2013 -0700

    Merge tag '0.10.5' into release

 sagenb/data/nodoctest.py                           |   0
 sagenb/data/sage/html/login.html                   |   7 +
 .../data/sage/html/settings/account_settings.html  |   2 +-
 .../data/sage/html/settings/user_management.html   |  14 +-
 sagenb/misc/misc.py                                |  23 ++--
 sagenb/misc/support.py                             |  10 +-
 sagenb/notebook/auth.py                            | 146 +++++++++++++++++++++
 sagenb/notebook/cell.py                            |   4 +-
 sagenb/notebook/conf.py                            |  23 +++-
 sagenb/notebook/run_notebook.py                    |   8 +-
 sagenb/notebook/sage_email.py                      |   3 +-
 sagenb/notebook/server_conf.py                     |  59 +++++++++
 sagenb/notebook/user.py                            |   9 +-
 sagenb/notebook/user_manager.py                    |  75 ++++++++++-
 sagenb/notebook/worksheet.py                       |   1 +
 sagenb/simple/twist.py                             |   8 +-
 setup.py                                           |   2 +-
 17 files changed, 351 insertions(+), 43 deletions(-)

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