Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 7 Jul 2016 17:42:22 +0000 (19:42 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 7 Jul 2016 17:42:22 +0000 (19:42 +0200)

Trivial merge