From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 9 Mar 2015 02:01:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=dcca5819675df1e9d9a1caf00af0f98bb2ce511c;p=youtube-dl.git

Merge remote-tracking branch 'origin/master'

Conflicts:
	youtube_dl/YoutubeDL.py
---

dcca5819675df1e9d9a1caf00af0f98bb2ce511c