Merge remote-tracking branch 'upstream/master' into bliptv

author remitamine <redacted>

Thu, 3 Dec 2015 19:33:22 +0000 (20:33 +0100)

committer remitamine <redacted>

Thu, 3 Dec 2015 19:33:22 +0000 (20:33 +0100)
author remitamine <redacted>
Thu, 3 Dec 2015 19:33:22 +0000 (20:33 +0100)
committer remitamine <redacted>
Thu, 3 Dec 2015 19:33:22 +0000 (20:33 +0100)
diff --cc youtube_dl/extractor/__init__.py
Simple merge
diff --cc youtube_dl/extractor/generic.py
Simple merge
author	remitamine <redacted>
	Thu, 3 Dec 2015 19:33:22 +0000 (20:33 +0100)
committer	remitamine <redacted>
	Thu, 3 Dec 2015 19:33:22 +0000 (20:33 +0100)
		1	2
youtube_dl/extractor/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/extractor/generic.py	patch \|	diff1 \|	diff2 \|	blob \| history