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)
commita54fbf2ca6a2b9cebb151c7af70d3949967e21b0
tree2cc7974789eeb1f97be6430f2155b3849d02553a
parentd8024aebe5b77b160006e7f3cfc144e8b9045a6b
parente0ef13ddebfab39d8c59c8cd9c11882cfc604070
Merge branch 'patch-8239' of https://github.com/ping/youtube-dl into ping-patch-8239