Merge with latest master

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 8ac2f03f..26d07283 100755
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ if sys.argv[-1] == 'publish':
 
 
 setup(
-    name='rest_framework',
+    name='djangorestframework',
     version=version,
     url='http://django-rest-framework.org',
     download_url='http://pypi.python.org/pypi/rest_framework/',