From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 22 Oct 2013 20:30:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=7853cc5ae1f9068f3bdf59ce959cb70645b9bc20;p=youtube-dl

Merge remote-tracking branch 'origin/master'

Conflicts:
	youtube_dl/YoutubeDL.py
---

7853cc5ae1f9068f3bdf59ce959cb70645b9bc20