[sagenb] 96/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 72d3ee2d3cdddbf94eec57c7c7dc55bd40886ccb
Merge: 632a2a8 a58843e
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Sun Apr 14 16:27:00 2013 +0200

    Merge branch 'master' into issue-98

 Changes                            |   6 +
 flask_version/admin.py             |  12 +-
 flask_version/authentication.py    |  12 +-
 flask_version/base.py              |  20 +-
 flask_version/decorators.py        |   2 +-
 flask_version/doc.py               |   4 +-
 flask_version/settings.py          |   2 +-
 flask_version/worksheet.py         |  66 +++---
 flask_version/worksheet_listing.py |  20 +-
 sagenb/data/sage/html/login.html   |   3 -
 sagenb/flask_version               |   1 +
 sagenb/misc/comments2rst.py        | 412 +++++++++++++++++++++++++++++++++++++
 sagenb/misc/results2rst.py         | 168 +++++++++++++++
 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    |  17 +-
 sagenb/notebook/server_conf.py     |  91 ++++----
 sagenb/notebook/template.py        |   2 +-
 sagenb/notebook/tutorial.py        |   2 +-
 sagenb/notebook/user_conf.py       |   2 +-
 sagenb/notebook/worksheet.py       |   4 +-
 setup.py                           |   3 +-
 26 files changed, 944 insertions(+), 134 deletions(-)


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