Merge branch 'download-archive'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 6 Oct 2013 14:30:26 +0000 (16:30 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 6 Oct 2013 14:30:26 +0000 (16:30 +0200)
commitb24f347190b02e519dae9e60e1dff2c56ecdd92f
tree5fb00f059d5d49df4467c14f0bd0b04d039045e0
parent2a69c6b87910d3dbeec14d3c6f7e16855944a0ad
parentee6c9f95e1e5cf118b0bdf6abc8376bd95bc7dcf
Merge branch 'download-archive'

Conflicts:
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py
youtube_dl/utils.py