From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 17 Jul 2014 20:32:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=72edb6fc8c49f41d078fbaac7b5264ec11f6cd54;p=youtube-dl

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

72edb6fc8c49f41d078fbaac7b5264ec11f6cd54