Merge branch 'brightcove_in_page_embed' of https://github.com/remitamine/youtube...

author Sergey M․ <dstftw@gmail.com>

Fri, 13 Nov 2015 19:23:15 +0000 (01:23 +0600)

committer Sergey M․ <dstftw@gmail.com>

Fri, 13 Nov 2015 19:23:15 +0000 (01:23 +0600)
author Sergey M․ <dstftw@gmail.com>
Fri, 13 Nov 2015 19:23:15 +0000 (01:23 +0600)
committer Sergey M․ <dstftw@gmail.com>
Fri, 13 Nov 2015 19:23:15 +0000 (01:23 +0600)
diff --cc youtube_dl/extractor/__init__.py
Simple merge
diff --cc youtube_dl/extractor/brightcove.py
Simple merge
diff --cc youtube_dl/extractor/generic.py
Simple merge
diff --cc youtube_dl/utils.py
Simple merge
author	Sergey M․ <dstftw@gmail.com>
	Fri, 13 Nov 2015 19:23:15 +0000 (01:23 +0600)
committer	Sergey M․ <dstftw@gmail.com>
	Fri, 13 Nov 2015 19:23:15 +0000 (01:23 +0600)
		1	2
youtube_dl/extractor/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/extractor/brightcove.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/extractor/generic.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history