Merge branch 'threads'

Conflicts:
	weboob/frontends/videoob/application.py
This commit is contained in:
Romain Bignon 2010-04-29 11:10:19 +02:00
commit 926a25b992
14 changed files with 305 additions and 65 deletions

View file

@ -164,3 +164,4 @@ class BaseApplication(object):
print 'Program killed by SIGINT'
except ConfigError, e:
print 'Configuration error: %s' % e
sys.exit(1)