Merge branch 'master' of github.com:rg3/youtube-dl
authorSergey M․ <dstftw@gmail.com>
Fri, 2 Jan 2015 14:57:12 +0000 (20:57 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 2 Jan 2015 14:57:12 +0000 (20:57 +0600)

Trivial merge