Merge pull request #1660 from pyed/master
[youtube-dl] / test / __init__.py