Merge branch 'douyutv' of https://github.com/bonfy/youtube-dl into bonfy-douyutv
authorSergey M․ <dstftw@gmail.com>
Tue, 17 Mar 2015 15:41:25 +0000 (21:41 +0600)
committerSergey M․ <dstftw@gmail.com>
Tue, 17 Mar 2015 15:41:25 +0000 (21:41 +0600)
commit674fb0fcc54c72448f80a0573f7fd116f220827e
treea1b5702f8afe6ca1f476f0541cb2a91142b7962d
parent00bfe40e4d2280d4988e1ce7402f65a0f1708cb8
parenta172d96292abda037b23b1f2b14dd2c6e65b56bb
Merge branch 'douyutv' of https://github.com/bonfy/youtube-dl into bonfy-douyutv
youtube_dl/extractor/__init__.py