From: Jaime Marquínez Ferrándiz Date: Fri, 23 Aug 2013 15:21:30 +0000 (+0200) Subject: Merge pull request #1301 from rzhxeo/xhamster X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=53b0f3e4e290016ccc0a905ec8a18efb5bd9af8a;p=youtube-dl Merge pull request #1301 from rzhxeo/xhamster XHamsterIE: Fix video extension and add video description --- 53b0f3e4e290016ccc0a905ec8a18efb5bd9af8a