Merge pull request #7296 from jaimeMF/xml_attrib_unicode

author Sergey M <dstftw@gmail.com>

Sat, 31 Oct 2015 18:15:21 +0000 (18:15 +0000)

committer Sergey M <dstftw@gmail.com>

Sat, 31 Oct 2015 18:15:21 +0000 (18:15 +0000)
author Sergey M <dstftw@gmail.com>
Sat, 31 Oct 2015 18:15:21 +0000 (18:15 +0000)
committer Sergey M <dstftw@gmail.com>
Sat, 31 Oct 2015 18:15:21 +0000 (18:15 +0000)
diff --cc test/test_utils.py
Simple merge
diff --cc youtube_dl/extractor/common.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>
	Sat, 31 Oct 2015 18:15:21 +0000 (18:15 +0000)
committer	Sergey M <dstftw@gmail.com>
	Sat, 31 Oct 2015 18:15:21 +0000 (18:15 +0000)
		1	2
test/test_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/extractor/common.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