From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 22 Mar 2014 13:21:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'hurda/patch-1'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=bfd718793cd524aeb5e8594c7e761a7240ed0ed5;p=youtube-dl

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

bfd718793cd524aeb5e8594c7e761a7240ed0ed5