[sagenb] 07/157: Merge tag '0.10.6' 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 44231d5ae4564d97a2e84af6f02659ad0810f9b9
Merge: 4b8e6a6 7f35c9b
Author: Keshav Kini <keshav.kini at gmail.com>
Date:   Sat Apr 27 19:52:28 2013 -0700

    Merge tag '0.10.6' into release

 COPYING                                            | 354 ++++++++++++++++++
 Changes                                            |  10 +
 flask_version/admin.py                             |  12 +-
 flask_version/authentication.py                    |  16 +-
 flask_version/base.py                              |  20 +-
 flask_version/decorators.py                        |   2 +-
 flask_version/doc.py                               |   4 +-
 flask_version/settings.py                          |   2 +-
 flask_version/worksheet.py                         |  69 ++--
 flask_version/worksheet_listing.py                 |  20 +-
 .../data/sage/html/accounts/account_recovery.html  |  13 +-
 sagenb/data/sage/html/login.html                   |   3 -
 sagenb/flask_version                               |   1 +
 sagenb/misc/comments2rst.py                        | 412 +++++++++++++++++++++
 sagenb/misc/results2rst.py                         | 168 +++++++++
 sagenb/misc/sphinxify.py                           |   9 +
 sagenb/misc/worksheet2rst.py                       | 204 ++++++++++
 sagenb/notebook/challenge.py                       |   2 +-
 sagenb/notebook/conf.py                            |   2 +-
 sagenb/notebook/notebook.py                        |  14 +-
 sagenb/notebook/notebook_object.py                 |   5 +
 sagenb/notebook/register.py                        |   2 +-
 sagenb/notebook/run_notebook.py                    |  11 +-
 sagenb/notebook/server_conf.py                     |  91 +++--
 sagenb/notebook/smtpsend.py                        |   4 +-
 sagenb/notebook/template.py                        |   2 +-
 sagenb/notebook/tutorial.py                        |   2 +-
 sagenb/notebook/user_conf.py                       |   2 +-
 sagenb/notebook/worksheet.py                       |   4 +-
 setup.py                                           |   3 +-
 30 files changed, 1321 insertions(+), 142 deletions(-)

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