[sagenb] 87/179: Merge pull request #147 from kini/livedoc_timeout

[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 4b0aeb6337a2c72abd47f2d7b79b4ae273fb50be
Merge: a2046d3 ffe48b4
Author: Keshav Kini <keshav.kini+github at gmail.com>
Date:   Tue Apr 2 01:10:02 2013 -0700

    Merge pull request #147 from kini/livedoc_timeout
    
    Increase timeout for live docs

 sagenb/notebook/notebook.py        | 12 +++--
 sagenb/notebook/notebook_object.py |  5 +++
 sagenb/notebook/run_notebook.py    |  6 ++-
 sagenb/notebook/server_conf.py     | 89 ++++++++++++++++++++++----------------
 4 files changed, 66 insertions(+), 46 deletions(-)


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