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

Conflicts:
	youtube-dl
	youtube_dl/InfoExtractors.py

diff --cc youtube_dl/InfoExtractors.py
index da2294a6b89b8e93bb1511babbdc282f2b46969e,869f5202cda57c7dd3f0c773fab31afd3f0a019e..7221ae41e4796adc0830b4ae789556ec3d1e7d26
--- 1/youtube_dl/InfoExtractors.py
--- 2/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@@ -3019,7 -3019,6 +3019,10 @@@ class YoukuIE(InfoExtractor)
                video_id = mobj.group('ID')
  
                info_url = 'http://v.youku.com/player/getPlayList/VideoIDS/' + video_id
++<<<<<<< HEAD
 +              print info_url
++=======
++>>>>>>> 51661d86005ffbdd4debd051cd9683cf5f5c2fe9
  
                request = urllib2.Request(info_url, None, std_headers)
                try: