Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 13 Dec 2014 22:05:28 +0000 (23:05 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 13 Dec 2014 22:05:28 +0000 (23:05 +0100)
commit74f91c4af7640a62dfe610fae80e92b0a40593c2
treed9a88a70c80ac72429c7314b649aa6491e4c468e
parentda4d4191a9037ef439ef3f93f02935c67dfcee85
parent2564300e55ec30754cbc416aaa134cbb0da1a5f4
Merge branch 'master' of github.com:rg3/youtube-dl