Merge branch 'restframework2' into rest-framework-2-merge2.0.0

Conflicts:
	.gitignore
	.travis.yml
	AUTHORS
	README.rst
	djangorestframework/mixins.py
	djangorestframework/renderers.py
	djangorestframework/resources.py
	djangorestframework/serializer.py
	djangorestframework/templates/djangorestframework/base.html
	djangorestframework/templates/djangorestframework/login.html
	djangorestframework/templatetags/add_query_param.py
	djangorestframework/tests/accept.py
	djangorestframework/tests/authentication.py
	djangorestframework/tests/content.py
	djangorestframework/tests/reverse.py
	djangorestframework/tests/serializer.py
	djangorestframework/views.py
	docs/examples.rst
	docs/examples/blogpost.rst
	docs/examples/modelviews.rst
	docs/examples/objectstore.rst
	docs/examples/permissions.rst
	docs/examples/pygments.rst
	docs/examples/views.rst
	docs/howto/alternativeframeworks.rst
	docs/howto/mixin.rst
	docs/howto/reverse.rst
	docs/howto/usingurllib2.rst
	docs/index.rst
	docs/topics/release-notes.md
	examples/sandbox/views.py
	rest_framework/__init__.py
	rest_framework/compat.py
	rest_framework/utils/breadcrumbs.py
	setup.py

1 files changed, 7 insertions, 10 deletions

diff --git a/setup.py b/setup.py
index 79bd7353..8ac2f03f 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ def get_package_data(package):
     return {package: filepaths}
 
 
-version = get_version('djangorestframework')
+version = get_version('rest_framework')
 
 
 if sys.argv[-1] == 'publish':
@@ -52,21 +52,18 @@ if sys.argv[-1] == 'publish':
 
 
 setup(
-    name='djangorestframework',
+    name='rest_framework',
     version=version,
     url='http://django-rest-framework.org',
-    download_url='http://pypi.python.org/pypi/djangorestframework/',
+    download_url='http://pypi.python.org/pypi/rest_framework/',
     license='BSD',
     description='A lightweight REST framework for Django.',
     author='Tom Christie',
     author_email='tom@tomchristie.com',
-    packages=get_packages('djangorestframework'),
-    package_data=get_package_data('djangorestframework'),
-    test_suite='djangorestframework.runtests.runcoverage.main',
-    install_requires=['URLObject>=0.6.0'],
-    extras_require={
-        'markdown': ["Markdown>=2.0"]
-    },
+    packages=get_packages('rest_framework'),
+    package_data=get_package_data('rest_framework'),
+    test_suite='rest_framework.runtests.runtests.main',
+    install_requires=[],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',