Merge remote-tracking branch 'rzhxeo/blip'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 5 Jan 2014 02:48:45 +0000 (03:48 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 5 Jan 2014 02:48:45 +0000 (03:48 +0100)
commitaff24732b96b5ec89cb41a05fd132e12c5990caf
treeb2acbbf6074e25bf42b6af491a970fca3db44523
parent455fa214b69cc5f78b955657719e2518365a7500
parent19dab5e6cc9e0a7a726af8bb67ca30801c2107b0
Merge remote-tracking branch 'rzhxeo/blip'

Conflicts:
youtube_dl/extractor/bliptv.py
youtube_dl/extractor/bliptv.py
youtube_dl/extractor/generic.py