Merge pull request #5961 from dstftw/force-generic-extractor

author Sergey M. <dstftw@gmail.com>

Wed, 24 Jun 2015 14:10:45 +0000 (19:10 +0500)

committer Sergey M. <dstftw@gmail.com>

Wed, 24 Jun 2015 14:10:45 +0000 (19:10 +0500)
author Sergey M. <dstftw@gmail.com>
Wed, 24 Jun 2015 14:10:45 +0000 (19:10 +0500)
committer Sergey M. <dstftw@gmail.com>
Wed, 24 Jun 2015 14:10:45 +0000 (19:10 +0500)
diff --cc youtube_dl/YoutubeDL.py
Simple merge
diff --cc youtube_dl/extractor/generic.py
Simple merge
diff --cc youtube_dl/options.py
Simple merge
author	Sergey M. <dstftw@gmail.com>
	Wed, 24 Jun 2015 14:10:45 +0000 (19:10 +0500)
committer	Sergey M. <dstftw@gmail.com>
	Wed, 24 Jun 2015 14:10:45 +0000 (19:10 +0500)
		1	2
youtube_dl/YoutubeDL.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/extractor/generic.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/options.py	patch \|	diff1 \|	diff2 \|	blob \| history