[sagenb] 13/179: Merge branch 'master' into ldap

[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 3886d6d984bc25dddefc55a613c10ab7f30f73e8
Merge: 8c862b7 3482721
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Sun Jul 8 13:47:06 2012 +0200

    Merge branch 'master' into ldap

 flask_version/base.py               |  4 ++++
 sagenb/data/sage/js/notebook_lib.js | 13 ++++++-------
 sagenb/notebook/run_notebook.py     | 10 +++++++++-
 3 files changed, 19 insertions(+), 8 deletions(-)

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