Merge branch 'master' into andrepl-master

Conflicts:
	debug_toolbar/middleware.py

1 files changed, 7 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 6051fad..7c5982d 100644
--- a/setup.py
+++ b/setup.py
@@ -8,10 +8,15 @@ setup(
     # Get more strings from http://www.python.org/pypi?:action=list_classifiers
     author='Rob Hudson',
     author_email='rob@cogit8.org',
-    url='http://robhudson.github.com/django-debug-toolbar/',
-    download_url='http://github.com/robhudson/django-debug-toolbar/downloads',
+    url='https://github.com/django-debug-toolbar/django-debug-toolbar',
+    download_url='https://github.com/django-debug-toolbar/django-debug-toolbar/downloads',
     license='BSD',
     packages=find_packages(exclude=['ez_setup']),
+    tests_require=[
+        'django',
+        'dingus',
+    ],
+    test_suite='debug_toolbar.runtests.runtests',
     include_package_data=True,
     zip_safe=False, # because we're including media that Django needs
     classifiers=[