Merge branch 'clipfish' of https://github.com/remitamine/youtube-dl into remitamine...
authorSergey M․ <dstftw@gmail.com>
Fri, 7 Aug 2015 18:21:42 +0000 (00:21 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 7 Aug 2015 18:21:42 +0000 (00:21 +0600)

Trivial merge