[sagenb] 56/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 c7a9093aa933db35f492f9c6e1c1afa752f2beb5
Merge: 016308e 29c17e7
Author: Karl-Dieter Crisman <kcrisman at gmail.com>
Date:   Tue Sep 16 17:29:42 2014 -0400

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

 sagenb/flask_version/authentication.py |  2 +-
 sagenb/notebook/user_manager.py        | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

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