[sagenb] 128/179: Merge pull request #171 from novoselt/no-default-timeouting

[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 d628ff4c7648a338f8484fb72210f65a04eda45e
Merge: 05d4d0a b9c27d3
Author: Andrey Novoseltsev <novoselt at gmail.com>
Date:   Fri Jun 21 17:22:53 2013 -0700

    Merge pull request #171 from novoselt/no-default-timeouting
    
    Set default timeout to 0 as documented and make it configurable

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

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