From: Pierre Rudloff <contact@rudloff.pro>
Date: Mon, 26 Aug 2013 01:16:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 2013.09.04~2^2~8
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7a20e2e1f8ff0893e239aa2d855d8a00a510d769;p=youtube-dl.git

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

7a20e2e1f8ff0893e239aa2d855d8a00a510d769