From: dongmao zhang <deanraccoon@gmail.com>
Date: Fri, 10 Aug 2012 10:32:28 +0000 (+0800)
Subject: Merge branch 'master' of github.com:thesues/youtube-dl
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=392105265ccb3e155fe92b3c0ac15b2b4ff906d3;hp=b5809a68bf94e5aa1172e5415be8d7fb91877de8;p=youtube-dl

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

Conflicts:
	youtube-dl
	youtube_dl/InfoExtractors.py
---

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index da2294a6b..7221ae41e 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -3019,7 +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:
@@ -3088,4 +3091,3 @@ class YoukuIE(InfoExtractor):
 			files_info.append(info)
 
 		return files_info
-# vim: tabstop=4 shiftwidth=4 softtabstop=4 noexpandtab