From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 3 Mar 2014 11:05:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=dcdfd1c711562380cea87a263de9e9e35ffbf20e;p=youtube-dl

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

dcdfd1c711562380cea87a263de9e9e35ffbf20e