git pushMerge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 4 Jun 2016 20:55:21 +0000 (22:55 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 4 Jun 2016 20:55:21 +0000 (22:55 +0200)

Trivial merge