Merge branch 'master' of github.com:rg3/youtube-dl
authorremitamine <remitamine@gmail.com>
Fri, 5 Feb 2016 16:20:00 +0000 (17:20 +0100)
committerremitamine <remitamine@gmail.com>
Fri, 5 Feb 2016 16:20:00 +0000 (17:20 +0100)

Trivial merge