Merge branch 'patch-2' of https://github.com/steven7851/youtube-dl into steven7851...
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 26 Aug 2016 14:29:46 +0000 (22:29 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 26 Aug 2016 14:29:46 +0000 (22:29 +0800)

Trivial merge