]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'sahutd/master'
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Mon, 27 Jan 2014 11:21:00 +0000 (12:21 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Mon, 27 Jan 2014 11:21:00 +0000 (12:21 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge