From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 25 Dec 2013 14:24:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=c3afc93a69fbfbe7712278f7ad03d0369ac9f885;p=youtube-dl.git

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

c3afc93a69fbfbe7712278f7ad03d0369ac9f885