Merge branch 'patch-8239' of https://github.com/ping/youtube-dl into ping-patch-8239
authorYen Chi Hsuan <yan12125@gmail.com>
Tue, 19 Jan 2016 20:15:46 +0000 (04:15 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Tue, 19 Jan 2016 20:15:46 +0000 (04:15 +0800)

Trivial merge