Merge remote-tracking branch 'origin/master' into pr-bbcnews
authorfnord <fnord@fnord.mobi>
Thu, 25 Jun 2015 05:34:46 +0000 (00:34 -0500)
committerfnord <fnord@fnord.mobi>
Thu, 25 Jun 2015 05:34:46 +0000 (00:34 -0500)
commitaa5740fb61d388754e9278a3e38de12203c1b89d
tree8195c113270d167f57225bdaa6f89df807341968
parentda92eeae42f556926cb676b3c14e270603b7e38e
parent18b5e1e5348ba3a6d1b6a98e97217eebb3d32a1e
Merge remote-tracking branch 'origin/master' into pr-bbcnews
youtube_dl/extractor/__init__.py
youtube_dl/extractor/bbc.py