From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 19 May 2014 15:10:19 +0000 (+0200)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=f50ee8d1c34f40b2774ec8fdc1bc669a4c757fcf;p=youtube-dl.git

Merge branch 'master' of github.com:rg3/youtube-dl
---

f50ee8d1c34f40b2774ec8fdc1bc669a4c757fcf