From: Philipp Hagemeister Date: Mon, 2 Feb 2015 19:32:07 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=ea71034bd3965de8ff7239516776296e2c9857c3;p=youtube-dl Merge remote-tracking branch 'origin/master' Conflicts: youtube_dl/downloader/external.py --- ea71034bd3965de8ff7239516776296e2c9857c3