Merge remote-tracking branch 'jaimeMF/load-info'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Dec 2013 03:55:02 +0000 (04:55 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Dec 2013 03:55:02 +0000 (04:55 +0100)
commitdb4da140273d119e6f75445ee6f8cc286523b63e
tree59e240a87e72b035071d74f8816845685b85ca00
parent2101830c0d27e6d9ad2f564ff004565e71da1ec5
parentd494389821de832874dc78abc2fe16365b5fe815
Merge remote-tracking branch 'jaimeMF/load-info'
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py