Merge remote-tracking branch 'jaimeMF/load-info'

author Philipp Hagemeister <phihag@phihag.de>

Mon, 9 Dec 2013 03:55:02 +0000 (04:55 +0100)

committer Philipp Hagemeister <phihag@phihag.de>

Mon, 9 Dec 2013 03:55:02 +0000 (04:55 +0100)
author Philipp Hagemeister <phihag@phihag.de>
Mon, 9 Dec 2013 03:55:02 +0000 (04:55 +0100)
committer Philipp Hagemeister <phihag@phihag.de>
Mon, 9 Dec 2013 03:55:02 +0000 (04:55 +0100)
diff --cc youtube_dl/YoutubeDL.py
Simple merge
diff --cc youtube_dl/__init__.py
Simple merge
author	Philipp Hagemeister <phihag@phihag.de>
	Mon, 9 Dec 2013 03:55:02 +0000 (04:55 +0100)
committer	Philipp Hagemeister <phihag@phihag.de>
	Mon, 9 Dec 2013 03:55:02 +0000 (04:55 +0100)
		1	2
youtube_dl/YoutubeDL.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history