Merge branch 'master' of github.com:rg3/youtube-dl

author Philipp Hagemeister <phihag@phihag.de>

Thu, 20 Dec 2012 20:28:32 +0000 (21:28 +0100)

committer Philipp Hagemeister <phihag@phihag.de>

Thu, 20 Dec 2012 20:28:32 +0000 (21:28 +0100)
author Philipp Hagemeister <phihag@phihag.de>
Thu, 20 Dec 2012 20:28:32 +0000 (21:28 +0100)
committer Philipp Hagemeister <phihag@phihag.de>
Thu, 20 Dec 2012 20:28:32 +0000 (21:28 +0100)
diff --cc test/tests.json
Simple merge
diff --cc youtube_dl/InfoExtractors.py
Simple merge
diff --cc youtube_dl/__init__.py
Simple merge
author	Philipp Hagemeister <phihag@phihag.de>
	Thu, 20 Dec 2012 20:28:32 +0000 (21:28 +0100)
committer	Philipp Hagemeister <phihag@phihag.de>
	Thu, 20 Dec 2012 20:28:32 +0000 (21:28 +0100)
		1	2
test/tests.json	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/InfoExtractors.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history