Merge remote-tracking branch 'jaimeMF/format_selection'

author Philipp Hagemeister <phihag@phihag.de>

Thu, 17 Oct 2013 22:17:03 +0000 (00:17 +0200)

committer Philipp Hagemeister <phihag@phihag.de>

Thu, 17 Oct 2013 22:17:03 +0000 (00:17 +0200)
author Philipp Hagemeister <phihag@phihag.de>
Thu, 17 Oct 2013 22:17:03 +0000 (00:17 +0200)
committer Philipp Hagemeister <phihag@phihag.de>
Thu, 17 Oct 2013 22:17:03 +0000 (00:17 +0200)
diff --cc youtube_dl/YoutubeDL.py
Simple merge
diff --cc youtube_dl/__init__.py
Simple merge
author	Philipp Hagemeister <phihag@phihag.de>
	Thu, 17 Oct 2013 22:17:03 +0000 (00:17 +0200)
committer	Philipp Hagemeister <phihag@phihag.de>
	Thu, 17 Oct 2013 22:17:03 +0000 (00:17 +0200)
		1	2
youtube_dl/YoutubeDL.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history