From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 21 Aug 2014 16:01:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=cab317a6804f9ca5a7de71e6baae5d6b32ddf053;p=youtube-dl

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

cab317a6804f9ca5a7de71e6baae5d6b32ddf053