Merge branch 'master' of github.com:rg3/youtube-dl
authorPetr Půlpán <Pulpan3@gmail.com>
Wed, 25 Jun 2014 15:45:24 +0000 (17:45 +0200)
committerPetr Půlpán <Pulpan3@gmail.com>
Wed, 25 Jun 2014 15:45:24 +0000 (17:45 +0200)

Trivial merge