Merge branch 'master' of github.com:rg3/youtube-dl
authorremitamine <remitamine@gmail.com>
Thu, 11 Feb 2016 17:13:56 +0000 (18:13 +0100)
committerremitamine <remitamine@gmail.com>
Thu, 11 Feb 2016 17:13:56 +0000 (18:13 +0100)

Trivial merge