From: Philipp Hagemeister Date: Mon, 9 Mar 2015 02:01:28 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=dcca5819675df1e9d9a1caf00af0f98bb2ce511c;p=youtube-dl Merge remote-tracking branch 'origin/master' Conflicts: youtube_dl/YoutubeDL.py --- dcca5819675df1e9d9a1caf00af0f98bb2ce511c