Merge branch 'master' of github.com:rg3/youtube-dl
authorremitamine <remitamine@gmail.com>
Thu, 31 Dec 2015 21:15:14 +0000 (22:15 +0100)
committerremitamine <remitamine@gmail.com>
Thu, 31 Dec 2015 21:15:14 +0000 (22:15 +0100)

Trivial merge