Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 12 Dec 2014 16:12:25 +0000 (17:12 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 12 Dec 2014 16:12:25 +0000 (17:12 +0100)
commit34bc0ae667d8632e5bc760884441d84f0a0a0b80
treee5deb777baeb5d65f92b807618a0ad3fb84a9781
parent2865cf0419a4c92133053f128934c64df0dccda9
parent58c1f6f0a708eb2b084e773d7aa74bfe37d80c6f
Merge branch 'master' of github.com:rg3/youtube-dl