From: Philipp Hagemeister Date: Tue, 30 Dec 2014 18:41:04 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=b3013681ff49712d5b5437efdff117ca544caadb;p=youtube-dl Merge remote-tracking branch 'origin/master' --- b3013681ff49712d5b5437efdff117ca544caadb