Filippo Valsorda 95eb771dcd Merge branch 'master' into fork_master ...

Conflicts:
	.travis.yml

2012-12-11 12:15:16 +01:00

..

__init__.py

Merge branch 'master' into fork_master

2012-12-11 12:15:16 +01:00

__main__.py

…

FileDownloader.py

print traceback on trouble if --verbose (why didn't I think of this before!?)

2012-12-11 11:02:21 +01:00

InfoExtractors.py

the test didn't load our Gzip opener

2012-12-11 11:33:15 +01:00

PostProcessor.py

…

utils.py

…

version.py

…