Merge branch 'pr-bbcnews' of https://github.com/atomicdryad/youtube-dl into atomicdry...

author Sergey M․ <dstftw@gmail.com>

Fri, 24 Jul 2015 14:21:48 +0000 (20:21 +0600)

committer Sergey M․ <dstftw@gmail.com>

Fri, 24 Jul 2015 14:21:48 +0000 (20:21 +0600)
author Sergey M․ <dstftw@gmail.com>
Fri, 24 Jul 2015 14:21:48 +0000 (20:21 +0600)
committer Sergey M․ <dstftw@gmail.com>
Fri, 24 Jul 2015 14:21:48 +0000 (20:21 +0600)
diff --cc youtube_dl/extractor/__init__.py
Simple merge
diff --cc youtube_dl/extractor/bbc.py
Simple merge
author	Sergey M․ <dstftw@gmail.com>
	Fri, 24 Jul 2015 14:21:48 +0000 (20:21 +0600)
committer	Sergey M․ <dstftw@gmail.com>
	Fri, 24 Jul 2015 14:21:48 +0000 (20:21 +0600)
		1	2
youtube_dl/extractor/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/extractor/bbc.py	patch \|	diff1 \|	diff2 \|	blob \| history