Merge branch 'master' of github.com:rg3/youtube-dl
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Wed, 26 Jun 2013 22:16:02 +0000 (00:16 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Wed, 26 Jun 2013 22:16:02 +0000 (00:16 +0200)

Trivial merge