]> git.bitcoin.ninja Git - youtube-dl/commit
Merge remote-tracking branch 'rzhxeo/embedly'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 5 Mar 2014 13:01:53 +0000 (14:01 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 5 Mar 2014 13:01:53 +0000 (14:01 +0100)
commitf55a1f0a8815c89b01a7a353cfa0bd5118f75829
tree615bd31e7405d059648ab3ddc973af6bc61824c0
parentbacac173a9ab310f48555bcb5796e11701cff899
parent1b86cc41cf3f7db5893597b4b1956104a77147f7
Merge remote-tracking branch 'rzhxeo/embedly'

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