From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 1 Sep 2014 21:13:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=a4446482027156c8221351d677bed8927d74e231;p=youtube-dl

Merge remote-tracking branch 'origin/master'

Conflicts:
	youtube_dl/extractor/eporner.py
	youtube_dl/extractor/hornbunny.py
---

a4446482027156c8221351d677bed8927d74e231