From: Pierre Rudloff Date: Thu, 22 Aug 2013 12:04:30 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=adeb9c73d638090349243383eca0c3c7ebc1e6bc;p=youtube-dl Merge remote-tracking branch 'upstream/master' --- adeb9c73d638090349243383eca0c3c7ebc1e6bc