Merge branch 'rtl2.py' of https://github.com/David-Development/youtube-dl into rtl2.py
authorDavid Development <david-dev@live.de>
Sat, 24 Jan 2015 23:09:21 +0000 (00:09 +0100)
committerDavid Development <david-dev@live.de>
Sat, 24 Jan 2015 23:09:21 +0000 (00:09 +0100)
Conflicts:
youtube_dl/extractor/rtl2.py


Trivial merge