Merge remote-tracking branch 'FiloSottille/supports'

author Philipp Hagemeister <phihag@phihag.de>

Thu, 27 Sep 2012 17:24:41 +0000 (19:24 +0200)

committer Philipp Hagemeister <phihag@phihag.de>

Thu, 27 Sep 2012 17:24:41 +0000 (19:24 +0200)
author Philipp Hagemeister <phihag@phihag.de>
Thu, 27 Sep 2012 17:24:41 +0000 (19:24 +0200)
committer Philipp Hagemeister <phihag@phihag.de>
Thu, 27 Sep 2012 17:24:41 +0000 (19:24 +0200)
diff --cc youtube_dl/InfoExtractors.py
Simple merge
diff --cc youtube_dl/__init__.py
Simple merge
author	Philipp Hagemeister <phihag@phihag.de>
	Thu, 27 Sep 2012 17:24:41 +0000 (19:24 +0200)
committer	Philipp Hagemeister <phihag@phihag.de>
	Thu, 27 Sep 2012 17:24:41 +0000 (19:24 +0200)
		1	2
youtube_dl/InfoExtractors.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history