Merge remote-tracking branch 'holomorph/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 2 Oct 2013 06:23:53 +0000 (08:23 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 2 Oct 2013 06:23:53 +0000 (08:23 +0200)
commit4f8bf17f23e2366205d8670fc9af2568063f7e89
tree0cd76f061d93cdca164bb9b102a6a039f37c594f
parentca40186c75d93250f9115328838703b021f21c8a
parentfa556755930db77c62016a468d870e76608db012
Merge remote-tracking branch 'holomorph/master'
youtube_dl/__init__.py
youtube_dl/extractor/youtube.py