Merge branch 'master' of github.com:rg3/youtube-dl
authorPetr Půlpán <Pulpan3@gmail.com>
Sun, 29 Jun 2014 14:44:37 +0000 (16:44 +0200)
committerPetr Půlpán <Pulpan3@gmail.com>
Sun, 29 Jun 2014 14:44:37 +0000 (16:44 +0200)

Trivial merge