Merge branch 'theintercept' of https://github.com/bit/youtube-dl into bit-theintercept
authorremitamine <remitamine@gmail.com>
Wed, 23 Dec 2015 20:50:27 +0000 (21:50 +0100)
committerremitamine <remitamine@gmail.com>
Wed, 23 Dec 2015 20:50:27 +0000 (21:50 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge