Merge branch 'master' of https://github.com/rg3/youtube-dl
authorSergey M <dstftw@gmail.com>
Sun, 2 Feb 2014 18:22:41 +0000 (01:22 +0700)
committerSergey M <dstftw@gmail.com>
Sun, 2 Feb 2014 18:22:41 +0000 (01:22 +0700)

Trivial merge