Merge branch 'master' of github.com:rg3/youtube-dl
authorremitamine <remitamine@gmail.com>
Wed, 2 Mar 2016 16:35:55 +0000 (17:35 +0100)
committerremitamine <remitamine@gmail.com>
Wed, 2 Mar 2016 16:35:55 +0000 (17:35 +0100)

Trivial merge