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

author Philipp Hagemeister <phihag@phihag.de>

Mon, 26 Nov 2012 22:25:04 +0000 (23:25 +0100)

committer Philipp Hagemeister <phihag@phihag.de>

Mon, 26 Nov 2012 22:25:04 +0000 (23:25 +0100)
author Philipp Hagemeister <phihag@phihag.de>
Mon, 26 Nov 2012 22:25:04 +0000 (23:25 +0100)
committer Philipp Hagemeister <phihag@phihag.de>
Mon, 26 Nov 2012 22:25:04 +0000 (23:25 +0100)
diff --cc Makefile
Simple merge
diff --cc README.md
Simple merge
diff --cc youtube-dl.1
Simple merge
author	Philipp Hagemeister <phihag@phihag.de>
	Mon, 26 Nov 2012 22:25:04 +0000 (23:25 +0100)
committer	Philipp Hagemeister <phihag@phihag.de>
	Mon, 26 Nov 2012 22:25:04 +0000 (23:25 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
youtube-dl.1	patch \|	diff1 \|	diff2 \|	blob \| history