Merge branch 'master' of github.com:rg3/youtube-dl
authorremitamine <remitamine@gmail.com>
Tue, 26 Jan 2016 14:55:38 +0000 (15:55 +0100)
committerremitamine <remitamine@gmail.com>
Tue, 26 Jan 2016 14:55:38 +0000 (15:55 +0100)

Trivial merge