Merge branch 'ndr' of https://github.com/remitamine/youtube-dl into remitamine-ndr
authorSergey M․ <dstftw@gmail.com>
Sat, 12 Sep 2015 14:44:31 +0000 (20:44 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 12 Sep 2015 14:44:31 +0000 (20:44 +0600)
1  2 
youtube_dl/extractor/__init__.py

Simple merge