# HG changeset patch
# User cavaliet
# Date 1345819355 -7200
# Node ID ccf202ab8abe193f7edcf352c0174881a026aaa6
# Parent  30b6831caa7adad727e07f9cd388faaffcf2ce33# Parent  45ddd94e130255ca8782e20bc51de019996e8633
Merge with 45ddd94e130255ca8782e20bc51de019996e8633

diff -r 30b6831caa7a -r ccf202ab8abe virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Fri Aug 24 16:39:52 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Fri Aug 24 16:42:35 2012 +0200
@@ -17,7 +17,7 @@
 URLS = {
     #'': {'setup': '', 'url':'', 'local':''},
     'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz', 'local':"distribute-0.6.24.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-    'DJANGO': {'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.4/tarball/', 'local':"Django-1.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'DJANGO': {'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.4.1/tarball/', 'local':"Django-1.4.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/tarball/0.8', 'local':"django-extensions-0.8.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/ubernostrum/django-registration/get/v0.8.tar.gz', 'local':"django-registration-0.8.tar.gz", 'install': {'method': 'easy_install', 'option_str': '-Z', 'dict_extra_env': None}},
     'DJANGO-TAGGING': { 'setup': 'django-tagging', 'url':'http://django-tagging.googlecode.com/files/django-tagging-0.3.1.tar.gz', 'local':"django-tagging-0.3.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
diff -r 30b6831caa7a -r ccf202ab8abe virtualenv/res/src/Django-1.4.1.tar.gz
Binary file virtualenv/res/src/Django-1.4.1.tar.gz has changed
diff -r 30b6831caa7a -r ccf202ab8abe virtualenv/res/src/Django-1.4.tar.gz
Binary file virtualenv/res/src/Django-1.4.tar.gz has changed