Merge remote-tracking branch 'xavierbeynon/audiomack'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 25 Oct 2014 06:55:12 +0000 (08:55 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 25 Oct 2014 06:55:12 +0000 (08:55 +0200)
commit7fc54e5262966370762ca7f186e9c709990b354d
tree1f9a19ffa6eab4379b23ab485edc1f710f5080cc
parentec9c978481eee1035ac478926a73f729232be204
parentd36cae46d877ebcc656f23a41b53e31731d2b77e
Merge remote-tracking branch 'xavierbeynon/audiomack'
youtube_dl/__init__.py
youtube_dl/extractor/__init__.py