Merge branch 'master' of github.com:rg3/youtube-dl

This commit is contained in:
Philipp Hagemeister 2013-06-24 00:06:01 +02:00
commit a3522dfddd

View file

@ -61,7 +61,7 @@
author = 'Ricardo Garcia', author = 'Ricardo Garcia',
maintainer = 'Philipp Hagemeister', maintainer = 'Philipp Hagemeister',
maintainer_email = 'phihag@phihag.de', maintainer_email = 'phihag@phihag.de',
packages = ['youtube_dl'], packages = ['youtube_dl', 'youtube_dl.extractor'],
# Provokes warning on most systems (why?!) # Provokes warning on most systems (why?!)
#test_suite = 'nose.collector', #test_suite = 'nose.collector',