Merge branch 'smotri.com' of https://github.com/dstftw/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 2 Dec 2013 14:56:35 +0000 (15:56 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 2 Dec 2013 14:56:35 +0000 (15:56 +0100)

Trivial merge