From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 20 Jul 2014 16:32:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=71a6eaff83636415f9a0f985bf6e4b35b859ab54;p=youtube-dl.git

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

71a6eaff83636415f9a0f985bf6e4b35b859ab54