]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge branch 'teletask' of https://github.com/MaxReimann/youtube-dl into MaxReimann...
authorSergey M․ <dstftw@gmail.com>
Thu, 25 Dec 2014 17:06:26 +0000 (23:06 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 25 Dec 2014 17:06:26 +0000 (23:06 +0600)
1  2 
youtube_dl/extractor/__init__.py

Simple merge