Merge branch 'master' of github.com:rg3/youtube-dl
authorYen Chi Hsuan <yan12125@gmail.com>
Thu, 7 May 2015 14:24:49 +0000 (22:24 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Thu, 7 May 2015 14:24:49 +0000 (22:24 +0800)

Trivial merge