Merge remote-tracking branch 'capital-G/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 24 Oct 2014 13:02:50 +0000 (15:02 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 24 Oct 2014 13:02:50 +0000 (15:02 +0200)
commit8d81f872fb9844ac640c84b8937d3a53b729d1aa
treed68084d2248b7a6fad2ff2979cc668796e5a2973
parent36f1c9049722fc80154d8ee571b1335286829111
parentce519b747e1e404f6d15ae68e1b1607a27beff1c
Merge remote-tracking branch 'capital-G/master'
youtube_dl/extractor/__init__.py