Merge remote-tracking branch 'origin/master' into IE_cleanup
authorFilippo Valsorda <filippo.valsorda@gmail.com>
Tue, 27 Nov 2012 22:20:32 +0000 (23:20 +0100)
committerFilippo Valsorda <filippo.valsorda@gmail.com>
Tue, 27 Nov 2012 22:20:32 +0000 (23:20 +0100)
commitc63cc10ffaeb2e5ab20b78f871bef8ca5492c78c
tree7fdc38bc0ddb01116af18b7f6ff567803513b457
parentf462df021a881c406afefc62bbf905ea582700ea
parent1a84d8675b4417ca9adf40bb12325c728767896a
Merge remote-tracking branch 'origin/master' into IE_cleanup

Conflicts:
youtube_dl/FileDownloader.py
youtube_dl/FileDownloader.py
youtube_dl/InfoExtractors.py