Merge branch '_stream' of https://github.com/pulpe/youtube-dl into pulpe-_stream
authorSergey M <dstftw@gmail.com>
Tue, 11 Feb 2014 02:18:46 +0000 (09:18 +0700)
committerSergey M <dstftw@gmail.com>
Tue, 11 Feb 2014 02:18:46 +0000 (09:18 +0700)
1  2 
youtube_dl/extractor/__init__.py

Simple merge