From: Philipp Hagemeister Date: Mon, 5 Jan 2015 17:18:15 +0000 (+0100) Subject: Merge remote-tracking branch 'Oteng/master' X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=18c3c15391de27d4dd6e550087ca244d294a9bf2;p=youtube-dl Merge remote-tracking branch 'Oteng/master' --- 18c3c15391de27d4dd6e550087ca244d294a9bf2