Merge remote-tracking branch 'patrickslin/patch-4'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 7 Aug 2013 18:19:51 +0000 (20:19 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 7 Aug 2013 18:19:51 +0000 (20:19 +0200)
commit356e0673903f40607eae0314db53bba876e54fd2
tree975cafd83b8e84701b5876ab7d55f2aa739fe558
parente2f48f96436f24af3001b4fc2600cc3d3c1bf0ac
parent36cb11f068b8bfc2822bdeca59f6dc2e42f896f9
Merge remote-tracking branch 'patrickslin/patch-4'
youtube_dl/extractor/youtube.py