Merge pull request #6097 from dstftw/union-itags-from-multiple-dashmpd

author Sergey M. <dstftw@gmail.com>

Mon, 29 Jun 2015 15:58:34 +0000 (20:58 +0500)

committer Sergey M. <dstftw@gmail.com>

Mon, 29 Jun 2015 15:58:34 +0000 (20:58 +0500)
author Sergey M. <dstftw@gmail.com>
Mon, 29 Jun 2015 15:58:34 +0000 (20:58 +0500)
committer Sergey M. <dstftw@gmail.com>
Mon, 29 Jun 2015 15:58:34 +0000 (20:58 +0500)
diff --cc youtube_dl/extractor/youtube.py
Simple merge
diff --cc youtube_dl/options.py
Simple merge
author	Sergey M. <dstftw@gmail.com>
	Mon, 29 Jun 2015 15:58:34 +0000 (20:58 +0500)
committer	Sergey M. <dstftw@gmail.com>
	Mon, 29 Jun 2015 15:58:34 +0000 (20:58 +0500)
		1	2
youtube_dl/extractor/youtube.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/options.py	patch \|	diff1 \|	diff2 \|	blob \| history