From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 28 Feb 2015 19:51:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=29cad7ad130c2e093c06d269c3b222e33adc218f;hp=29cad7ad130c2e093c06d269c3b222e33adc218f;p=youtube-dl

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