[sagenb] 71/179: Merge branch 'master' into issue-98

[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 632a2a8b04c26371153dd3e12ceb8dc66da97598
Merge: a84ac42 a2eb724
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Sat Mar 23 12:40:19 2013 +0100

    Merge branch 'master' into issue-98

 sagenb/data/nodoctest.py         |  0
 sagenb/data/sage/html/login.html |  7 +++++++
 sagenb/misc/misc.py              | 21 ++++++++++++---------
 sagenb/misc/support.py           | 10 +++++-----
 sagenb/notebook/cell.py          |  4 ++--
 sagenb/notebook/conf.py          | 12 +++++++++---
 sagenb/notebook/run_notebook.py  |  2 ++
 sagenb/notebook/sage_email.py    |  3 ++-
 sagenb/notebook/worksheet.py     |  1 +
 sagenb/simple/twist.py           |  8 ++++----
 10 files changed, 44 insertions(+), 24 deletions(-)

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