Merge pull request #5523 from jaimeMF/remove-format-limit

author Sergey M. <dstftw@gmail.com>

Mon, 27 Apr 2015 11:44:58 +0000 (16:44 +0500)

committer Sergey M. <dstftw@gmail.com>

Mon, 27 Apr 2015 11:44:58 +0000 (16:44 +0500)
author Sergey M. <dstftw@gmail.com>
Mon, 27 Apr 2015 11:44:58 +0000 (16:44 +0500)
committer Sergey M. <dstftw@gmail.com>
Mon, 27 Apr 2015 11:44:58 +0000 (16:44 +0500)
diff --cc README.md
Simple merge
diff --cc youtube_dl/utils.py
Simple merge
author	Sergey M. <dstftw@gmail.com>
	Mon, 27 Apr 2015 11:44:58 +0000 (16:44 +0500)
committer	Sergey M. <dstftw@gmail.com>
	Mon, 27 Apr 2015 11:44:58 +0000 (16:44 +0500)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history