[sagenb] 70/179: Merge pull request #142 from rmartinjak/issue141

[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 a2eb7247e3fa4870cf6673a20a261b0ab815dfc8
Merge: 12f532c b6aa62d
Author: Keshav Kini <keshav.kini+github at gmail.com>
Date:   Fri Mar 22 19:19:24 2013 -0700

    Merge pull request #142 from rmartinjak/issue141
    
    fix #141 and catch conversion errors when updating settings

 sagenb/notebook/conf.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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