[sagenb] 71/157: Merge branch 'master' of https://github.com/sagemath/sagenb

[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 c3001ee73c6adfced7ff83fe1a96d6ff758f8be1
Merge: c7a9093 e4fe22b
Author: Karl-Dieter Crisman <kcrisman at gmail.com>
Date:   Wed Sep 17 15:20:01 2014 -0400

    Merge branch 'master' of https://github.com/sagemath/sagenb
    
    necessary,

 sagenb/data/sage/html/login.html                   |    2 +-
 sagenb/data/sage/html/notebook/base.html           |    2 +-
 sagenb/data/sage/html/notebook/worksheet_page.html |    2 +
 sagenb/data/sage/html/settings/admin_add_user.html |   15 +-
 sagenb/data/sage/html/upload.html                  |   37 +-
 sagenb/flask_version/admin.py                      |   11 +-
 sagenb/flask_version/base.py                       |    3 +-
 sagenb/flask_version/settings.py                   |    3 +-
 sagenb/flask_version/worksheet_listing.py          |    3 +-
 sagenb/notebook/tutorial.py                        |    2 +-
 sagenb/translations/cs_CZ/LC_MESSAGES/messages.mo  |  Bin 51440 -> 53716 bytes
 sagenb/translations/cs_CZ/LC_MESSAGES/messages.po  |   21 +
 sagenb/translations/de_AT/LC_MESSAGES/messages.mo  |  Bin 53956 -> 57053 bytes
 sagenb/translations/de_AT/LC_MESSAGES/messages.po  |   21 +
 sagenb/translations/en_US/LC_MESSAGES/messages.mo  |  Bin 0 -> 839 bytes
 sagenb/translations/en_US/LC_MESSAGES/messages.po  |   41 +
 sagenb/translations/es_ES/LC_MESSAGES/messages.mo  |  Bin 0 -> 57962 bytes
 sagenb/translations/es_ES/LC_MESSAGES/messages.po  | 2632 ++++++++++++++++++++
 sagenb/translations/fr_FR/LC_MESSAGES/messages.mo  |  Bin 56793 -> 57111 bytes
 sagenb/translations/fr_FR/LC_MESSAGES/messages.po  |   21 +
 sagenb/translations/pt_BR/LC_MESSAGES/messages.mo  |  Bin 51626 -> 54347 bytes
 sagenb/translations/pt_BR/LC_MESSAGES/messages.po  |   21 +
 sagenb/translations/ru_RU/LC_MESSAGES/messages.mo  |  Bin 71164 -> 74453 bytes
 sagenb/translations/ru_RU/LC_MESSAGES/messages.po  |   23 +-
 24 files changed, 2823 insertions(+), 37 deletions(-)

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