# HG changeset patch
# User cavaliet
# Date 1361987032 -3600
# Node ID 271ec94b1c6fdebd6e394fe0d4f422c7c25708e2
# Parent  5a3d8a3eb34d0f9bd0ee111aa6d1146efe8405e5# Parent  892974574bde62b0854beb973d5c2a5c8f309be3
Merge with 892974574bde62b0854beb973d5c2a5c8f309be3

diff -r 5a3d8a3eb34d -r 271ec94b1c6f sbin/sync/config.py.tmpl
--- a/sbin/sync/config.py.tmpl	Wed Feb 27 18:42:19 2013 +0100
+++ b/sbin/sync/config.py.tmpl	Wed Feb 27 18:43:52 2013 +0100
@@ -6,7 +6,7 @@
 env.web_group = 'www-data'
 env.folders = ['../run/log', 'static/media']
 
-env.repos = {'web' : "/Users/ymh/dev/workspace/egonomy"}
+env.repos = {'web' : {'repo':"/Users/ymh/dev/workspace/egonomy", 'src_root':'src'}}
 env.base_export_path = "~/tmp"
 env.export_prefix = "egonomy"
 
diff -r 5a3d8a3eb34d -r 271ec94b1c6f src/egonomy/config.py.tmpl
--- a/src/egonomy/config.py.tmpl	Wed Feb 27 18:42:19 2013 +0100
+++ b/src/egonomy/config.py.tmpl	Wed Feb 27 18:43:52 2013 +0100
@@ -30,7 +30,7 @@
 
 CACHES = {
     'default': {
-        'BACKEND': 'django.core.cache.backends.DummyCache',
+        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
 #        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
 #        'LOCATION': 'unix:/var/run/memcached/memcached.socket',
 #        'KEY_PREFIX': 'ldt',
diff -r 5a3d8a3eb34d -r 271ec94b1c6f virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Wed Feb 27 18:42:19 2013 +0100
+++ b/virtualenv/res/lib/lib_create_env.py	Wed Feb 27 18:43:52 2013 +0100
@@ -17,7 +17,7 @@
 URLS = {
     #'': {'setup': '', 'url':'', 'local':''},
     'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.31.tar.gz', 'local':"distribute-0.6.31.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-    'DJANGO': {'setup': 'django', 'url': 'https://www.djangoproject.com/download/1.5c2/tarball/', 'local':"Django-1.5c2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'DJANGO': {'setup': 'django', 'url': 'https://www.djangoproject.com/download/1.5/tarball/', 'local':"Django-1.5.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.0.2.tar.gz', 'local':"django-extensions-1.0.2.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}},
     'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-0.7.5.tar.gz', 'local':"south-0.7.5.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
diff -r 5a3d8a3eb34d -r 271ec94b1c6f virtualenv/res/src/Django-1.5.tar.gz
Binary file virtualenv/res/src/Django-1.5.tar.gz has changed
diff -r 5a3d8a3eb34d -r 271ec94b1c6f virtualenv/res/src/Django-1.5c2.tar.gz
Binary file virtualenv/res/src/Django-1.5c2.tar.gz has changed