# HG changeset patch
# User cavaliet
# Date 1379330011 -7200
# Node ID 3120bf6cd1e8ec57978c3327c61218d02b7b037a
# Parent  33a7b2a4af87daae4075e71fc1c12d69f9cf9cb3# Parent  49fda47ceb161babbf3d74d329a6954954716ec1
Merge with 49fda47ceb161babbf3d74d329a6954954716ec1

diff -r 33a7b2a4af87 -r 3120bf6cd1e8 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Mon Sep 16 13:12:57 2013 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Mon Sep 16 13:13:31 2013 +0200
@@ -17,7 +17,7 @@
 URLS = {
     #'': {'setup': '', 'url':'', 'local':''},
     'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz', 'local':"distribute-0.6.34.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-    'DJANGO': {'setup': 'django', 'url': 'https://github.com/IRI-Research/django/archive/698eff4a5da55a1b5a8b4ecddab2b2a85854d4da.tar.gz', 'local':"Django-1.5.2.dev20130524113953.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'DJANGO': {'setup': 'django', 'url': 'https://github.com/IRI-Research/django/archive/1.5.4+IRI.tar.gz', 'local':"django-1.5.4-IRI.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'SIX' : {'setup':'six', 'url':'https://pypi.python.org/packages/source/s/six/six-1.3.0.tar.gz', 'local': 'six-1.3.0.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/archive/1.1.1.tar.gz', 'local':"django-extensions-1.1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-0.7.6.tar.gz', 'local':"south-0.7.6.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
diff -r 33a7b2a4af87 -r 3120bf6cd1e8 virtualenv/res/src/Django-1.5.2.dev20130524113953.tar.gz
Binary file virtualenv/res/src/Django-1.5.2.dev20130524113953.tar.gz has changed
diff -r 33a7b2a4af87 -r 3120bf6cd1e8 virtualenv/res/src/django-1.5.4-IRI.tar.gz
Binary file virtualenv/res/src/django-1.5.4-IRI.tar.gz has changed
diff -r 33a7b2a4af87 -r 3120bf6cd1e8 virtualenv/web/res/requirement.txt
--- a/virtualenv/web/res/requirement.txt	Mon Sep 16 13:12:57 2013 +0200
+++ b/virtualenv/web/res/requirement.txt	Mon Sep 16 13:13:31 2013 +0200
@@ -1,5 +1,5 @@
 -f ../../res/src
-Django==1.5.2.dev20130524113953
+Django==1.5.4-IRI
 Markdown==2.3.1
 SPARQLWrapper==1.5.2
 South==0.7.6