[sagenb] 101/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 4b492c1b6036a50b0e404e8de6c19d8c83be726d
Merge: c3001ee ece3ebf
Author: Karl-Dieter Crisman <kcrisman at gmail.com>
Date:   Fri Oct 17 10:27:15 2014 -0400

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

 Changes                         |  7 +++++++
 sagenb/notebook/interact.py     | 26 +++++++++++++-------------
 sagenb/notebook/run_notebook.py |  9 +++++++++
 setup.py                        |  2 +-
 4 files changed, 30 insertions(+), 14 deletions(-)

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