[sagenb] 33/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 ed2d09c177b038712a8c4e104cf26f6a045df282
Merge: faf600e cf421ee
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Fri Nov 2 12:33:11 2012 +0100

    Merge branch 'master' into ldap

 flask_version/authentication.py     |  2 +-
 sagenb/misc/sphinxify.py            | 21 ++-------------------
 sagenb/misc/support.py              | 16 ++++------------
 sagenb/notebook/docHTMLProcessor.py |  2 +-
 sagenb/notebook/notebook.py         |  1 +
 5 files changed, 9 insertions(+), 33 deletions(-)


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