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

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

35f76e0061373ad344b3cbea30422c586abc16b5