Merge branch 'sohu_fix' of https://github.com/yan12125/youtube-dl into yan12125-sohu_fix

author Sergey M․ <dstftw@gmail.com>

Tue, 17 Mar 2015 15:18:36 +0000 (21:18 +0600)

committer Sergey M․ <dstftw@gmail.com>

Tue, 17 Mar 2015 15:18:36 +0000 (21:18 +0600)
author Sergey M․ <dstftw@gmail.com>
Tue, 17 Mar 2015 15:18:36 +0000 (21:18 +0600)
committer Sergey M․ <dstftw@gmail.com>
Tue, 17 Mar 2015 15:18:36 +0000 (21:18 +0600)
diff --cc test/test_utils.py
Simple merge
diff --cc youtube_dl/utils.py
Simple merge
author	Sergey M․ <dstftw@gmail.com>
	Tue, 17 Mar 2015 15:18:36 +0000 (21:18 +0600)
committer	Sergey M․ <dstftw@gmail.com>
	Tue, 17 Mar 2015 15:18:36 +0000 (21:18 +0600)
		1	2
test/test_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history