Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Mar 2015 02:01:28 +0000 (03:01 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Mar 2015 02:01:28 +0000 (03:01 +0100)
commitdcca5819675df1e9d9a1caf00af0f98bb2ce511c
tree47523d0851107978072ca6dd5c982dafe7abff47
parentd475b3384cd372d89c35b9b1c26499f1e9cc1915
parentdd7831fe94a0fb8270e7fa3699677c7476a5cd83
Merge remote-tracking branch 'origin/master'

Conflicts:
youtube_dl/YoutubeDL.py