From: Andreas Schmitz Date: Fri, 7 Feb 2014 11:20:58 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=f4371f47849bcc3f53bf96eb10c29b1081bc374a;p=youtube-dl Merge remote-tracking branch 'upstream/master' --- f4371f47849bcc3f53bf96eb10c29b1081bc374a