From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 13 Sep 2011 21:35:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'CaptainPatate/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=34554a7ad4186ad5f39d1b9903b8b619bd77bba1;hp=93e1659586d0741f5f7987e6c5232e9636f7df72;p=youtube-dl

Merge remote-tracking branch 'CaptainPatate/master'
---

diff --git a/youtube-dl b/youtube-dl
index 4bb84386a..760930e44 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -1917,7 +1917,6 @@ class YahooIE(InfoExtractor):
 				'thumbnail':	video_thumbnail.decode('utf-8'),
 				'description':	video_description,
 				'thumbnail':	video_thumbnail,
-				'description':	video_description,
 				'player_url':	None,
 			})
 		except UnavailableVideoError: