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)
commit6695916045123b76d4f0bd1761b6986c542a5a55
tree214de41be328e6c2a51456db7bc6d175c371713b
parent7906d199a11c0f8deccc0f87d7ee850106c361dc
parent8011fba3ae4301995f77c64ac63a4a467ef73b7e
Merge branch 'rtl2.py' of https://github.com/David-Development/youtube-dl into rtl2.py

Conflicts:
youtube_dl/extractor/rtl2.py