[sagenb] 86/179: Merge pull request #1 from ppurka/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 ffe48b4576928cbb141ffc303681922797f81442
Merge: 7346a9a 9a0b7a4
Author: Keshav Kini <keshav.kini+github at gmail.com>
Date:   Tue Apr 2 01:07:01 2013 -0700

    Merge pull request #1 from ppurka/livedoc_timeout
    
    add options for live documentation timeout to the notebook command

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

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