[sagenb] 09/179: Merge remote-tracking branch 'sagemath/master' into sws2rst

[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 5da34604d53b32bd832becc8106bf94b8e101bf4
Merge: 94f0b0c b0ce4e7
Author: Karl-Dieter Crisman <kcrisman at gmail.com>
Date:   Thu Jun 21 12:47:32 2012 -0400

    Merge remote-tracking branch 'sagemath/master' into sws2rst

 .hgignore                                         |   74 -
 MANIFEST.in                                       |   16 +-
 Makefile                                          |   37 -
 README.rst                                        |   73 +
 SPKG.txt                                          |   98 -
 dist.sh                                           |   58 +
 flask_version/admin.py                            |    2 +-
 flask_version/worksheet.py                        |   42 +-
 flask_version/worksheet_listing.py                |   25 +-
 go                                                |    7 -
 sagenb/babel.cfg                                  |   10 +-
 sagenb/data/sage/html/accounts/registration.html  |   54 +-
 sagenb/data/sage/html/notebook/base.html          |    4 +
 sagenb/data/sage/html/notebook/cell.html          |   17 +-
 sagenb/data/sage/html/worksheet_listing.html      |    4 +
 sagenb/data/sage/js/jmol_lib.js                   | 1233 +++++++++-
 sagenb/data/sage/js/notebook_lib.js               |   73 +
 sagenb/message.pot                                | 1560 ++++++------
 sagenb/misc/sageinspect.py                        | 1145 +--------
 sagenb/misc/support.py                            |   10 +-
 sagenb/notebook/cell.py                           |   51 +-
 sagenb/notebook/challenge.py                      |   22 +-
 sagenb/notebook/notebook.py                       |    6 +
 sagenb/notebook/notebook_object.py                |   45 +-
 sagenb/notebook/run_notebook.py                   |   80 +-
 sagenb/notebook/server_conf.py                    |   51 +-
 sagenb/storage/filesystem_storage.py              |   18 +
 sagenb/translations/ru_RU/LC_MESSAGES/messages.mo |  Bin 0 -> 71164 bytes
 sagenb/translations/ru_RU/LC_MESSAGES/messages.po | 2706 +++++++++++++++++++++
 sass/src/main.scss                                |    2 +-
 sdist                                             |   36 -
 setup.py                                          |   95 +-
 spkg-dist                                         |  257 --
 util/fetch_deps.py                                |   51 +
 util/quota.py                                     |   46 +
 35 files changed, 5404 insertions(+), 2604 deletions(-)

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