From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 13 May 2014 07:52:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'frewsxcv/patch-1'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=26d886354f421ea89bfa86f3a7c3a9dd19805bb0

Merge remote-tracking branch 'frewsxcv/patch-1'
---

26d886354f421ea89bfa86f3a7c3a9dd19805bb0