Merge remote-tracking branch 'naglis/wistia'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 25 Sep 2014 00:03:49 +0000 (02:03 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 25 Sep 2014 00:03:49 +0000 (02:03 +0200)
commitc6e90caaa661e8368f099055c609c7c121bbbc2b
tree3d12ada9f64b3b048b9328d3e7e25d7505523555
parent4bbf157794084e1ca076b63c402bc5aab4a5ad0a
parent746c67d72f760f2805dbc125e5a3863aa0d569e3
Merge remote-tracking branch 'naglis/wistia'
youtube_dl/extractor/generic.py