Merge branch 'master' of github.com:rg3/youtube-dl
authorremitamine <remitamine@gmail.com>
Sun, 27 Dec 2015 14:03:13 +0000 (15:03 +0100)
committerremitamine <remitamine@gmail.com>
Sun, 27 Dec 2015 14:03:13 +0000 (15:03 +0100)

Trivial merge