From: David Development <david-dev@live.de>
Date: Sat, 24 Jan 2015 23:09:21 +0000 (+0100)
Subject: Merge branch 'rtl2.py' of https://github.com/David-Development/youtube-dl into rtl2.py
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=6695916045123b76d4f0bd1761b6986c542a5a55;p=youtube-dl

Merge branch 'rtl2.py' of https://github.com/David-Development/youtube-dl into rtl2.py

Conflicts:
	youtube_dl/extractor/rtl2.py
---

6695916045123b76d4f0bd1761b6986c542a5a55