[sagenb] 51/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 f5d5e31791de858c424757b5830efb9eed263a9e
Merge: 6bd2ee9 efa9d10
Author: Karl-Dieter Crisman <kcrisman at gmail.com>
Date:   Tue Sep 16 16:38:25 2014 -0400

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

 MANIFEST.in                                        |  1 -
 sagenb/flask_version                               |  1 -
 .../flask_version}/__init__.py                     |  0
 {flask_version => sagenb/flask_version}/admin.py   |  0
 .../flask_version}/authentication.py               |  0
 {flask_version => sagenb/flask_version}/base.py    |  0
 .../flask_version}/decorators.py                   |  0
 {flask_version => sagenb/flask_version}/doc.py     |  0
 .../flask_version}/nodoctest.py                    |  0
 .../flask_version}/settings.py                     | 13 ++++-
 .../flask_version}/worksheet.py                    |  0
 .../flask_version}/worksheet_listing.py            |  0
 sagenb/message.pot                                 |  4 +-
 sagenb/misc/sphinxify.py                           |  6 +-
 sagenb/translations/ru_RU/LC_MESSAGES/messages.po  | 64 +++++++++++-----------
 15 files changed, 47 insertions(+), 42 deletions(-)

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