Merge pull request #2041 from dstftw/imdb-list

author Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>

Wed, 1 Jan 2014 11:42:59 +0000 (12:42 +0100)

committer Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>

Wed, 1 Jan 2014 11:45:09 +0000 (12:45 +0100)
author Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Wed, 1 Jan 2014 11:42:59 +0000 (12:42 +0100)
committer Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Wed, 1 Jan 2014 11:45:09 +0000 (12:45 +0100)
diff --cc test/test_playlists.py

index 1b7b4e3d808cb936fa5fac07136049bd174a4490,81352de6bb9c09d0aa03ea49fb6d0959475c6523..9d522b3574c221bf6594cd9965ea17bf47b671c6
--- 1/test/test_playlists.py
--- 2/test/test_playlists.py
+++ b/test/test_playlists.py
@@@ -28,7 -28,8 +28,8 @@@ from youtube_dl.extractor import 
       BandcampAlbumIE,
       SmotriCommunityIE,
       SmotriUserIE,
-     IviCompilationIE
+     IviCompilationIE,
- -    ImdbListIE
++    ImdbListIE,
   )
   
   
diff --cc youtube_dl/extractor/__init__.py
Simple merge
author	Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
	Wed, 1 Jan 2014 11:42:59 +0000 (12:42 +0100)
committer	Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
	Wed, 1 Jan 2014 11:45:09 +0000 (12:45 +0100)
		1	2
test/test_playlists.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/extractor/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history