Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 22 Oct 2013 20:30:06 +0000 (22:30 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 22 Oct 2013 20:30:06 +0000 (22:30 +0200)
commit7853cc5ae1f9068f3bdf59ce959cb70645b9bc20
tree82f0855ff96d3027c2026d2460a2a6c14d0fa6cc
parent586a91b67f6fe7254beefc3831b4e4649f84f0ce
parentb028e96144a2bf1ba84dd6d11f1cc13a2928c438
Merge remote-tracking branch 'origin/master'

Conflicts:
youtube_dl/YoutubeDL.py
youtube_dl/YoutubeDL.py