Merge branch 'atomicparsley' (closes #2436)
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 12 Apr 2014 13:52:42 +0000 (15:52 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 12 Apr 2014 13:52:42 +0000 (15:52 +0200)
commit77477fa4c916599e7eaa236a3f3eb5703923cf91
tree527528edd5feb3eccd088ad171d1e868d0a010ea
parent381640e3acf65e9eac52b6ad47d7f7cad45a7d6d
parenta169e18ce16567ef123007a22758bcda48d07f92
Merge branch 'atomicparsley' (closes #2436)
youtube_dl/__init__.py
youtube_dl/postprocessor/ffmpeg.py