]> gitweb @ CieloNegro.org - youtube-dl.git/commit
Merge remote-tracking branch 'aft90/merge-output-format'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 10 Jan 2015 00:59:14 +0000 (01:59 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 10 Jan 2015 00:59:14 +0000 (01:59 +0100)
commit45598f15788568a8432da19544e5bdc390032aca
treee0c41e910eb267c6ef254f8d47cc36f32d5663ac
parent130239460370870c33f259ed1549878388996d3f
parentd02115f83727ae0d4f394073235dc97086c64266
Merge remote-tracking branch 'aft90/merge-output-format'

Conflicts:
youtube_dl/YoutubeDL.py
youtube_dl/YoutubeDL.py