From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 1 Jan 2014 14:30:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=eadaf08c1670d2fc9a2078faca95fbc49d6a5af0;p=youtube-dl

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

eadaf08c1670d2fc9a2078faca95fbc49d6a5af0