Merge remote-tracking branch 'anovicecodemonkey/generic-data-video-url'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 22 Aug 2014 15:40:36 +0000 (17:40 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 22 Aug 2014 15:40:36 +0000 (17:40 +0200)
commitc71dfccc98208be44b1f639af72a257dae34d966
tree5dcbfcc50d8c44aa2885913c5a350ee11cf2135b
parent1a9ccac7c16acc52327959e1ef2eef7295fbe2b7
parent37e3cbe22e0bfa6b98a6343be88e1c8c2c7ac41f
Merge remote-tracking branch 'anovicecodemonkey/generic-data-video-url'

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