[sagenb] 26/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 ee26f715e622082dbf6e472e58a3c583f988d649
Merge: d9c1c4c dbabb90
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Tue Sep 11 14:44:40 2012 +0200

    Merge branch 'master' into ldap

 README.rst                          | 19 +++++++++----------
 sagenb/data/sage/js/notebook_lib.js |  1 -
 sagenb/notebook/notebook_object.py  |  4 ++++
 sagenb/notebook/run_notebook.py     | 20 ++++++++++++++++----
 setup.py                            |  3 +--
 util/fetch_deps.py                  |  1 -
 6 files changed, 30 insertions(+), 18 deletions(-)

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