Merge branch 'next-url'

author Filippo Valsorda <filippo.valsorda@gmail.com>

Sun, 25 Mar 2012 00:07:47 +0000 (01:07 +0100)

committer Filippo Valsorda <filippo.valsorda@gmail.com>

Sun, 25 Mar 2012 00:07:47 +0000 (01:07 +0100)
author Filippo Valsorda <filippo.valsorda@gmail.com>
Sun, 25 Mar 2012 00:07:47 +0000 (01:07 +0100)
committer Filippo Valsorda <filippo.valsorda@gmail.com>
Sun, 25 Mar 2012 00:07:47 +0000 (01:07 +0100)
diff --cc youtube-dl
Simple merge
diff --cc youtube_dl/__init__.py
Simple merge
author	Filippo Valsorda <filippo.valsorda@gmail.com>
	Sun, 25 Mar 2012 00:07:47 +0000 (01:07 +0100)
committer	Filippo Valsorda <filippo.valsorda@gmail.com>
	Sun, 25 Mar 2012 00:07:47 +0000 (01:07 +0100)
		1	2
youtube-dl	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history