# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1379271768 -7200
# Node ID e30c9bfaf94518127297413534606b629bcd5c8a
# Parent  219e27e5e26d07493f3efcf26713c151d251d213
update django and small settings changes

diff -r 219e27e5e26d -r e30c9bfaf945 .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Wed Sep 11 17:52:17 2013 +0200
+++ b/.settings/org.eclipse.core.resources.prefs	Sun Sep 15 21:02:48 2013 +0200
@@ -1,2 +1,9 @@
 eclipse.preferences.version=1
+encoding//src/core/migrations/0008_populate_nb_notice.py=utf-8
+encoding//src/core/models/term.py=utf-8
+encoding//src/jocondelab/management/commands/import_terms.py=utf-8
 encoding//src/jocondelab/migrations/0005_auto__add_termlinks__add_dbpediafields.py=utf-8
+encoding//src/jocondelab/settings.py=utf-8
+encoding//src/jocondelab/utils.py=utf-8
+encoding//src/jocondelab/views/back_office.py=utf-8
+encoding//virtualenv/web/env/venv_jocondelab/lib/python2.7/site-packages/django/conf/locale/vi/formats.py=utf-8
diff -r 219e27e5e26d -r e30c9bfaf945 src/jocondelab/config.py.tmpl
--- a/src/jocondelab/config.py.tmpl	Wed Sep 11 17:52:17 2013 +0200
+++ b/src/jocondelab/config.py.tmpl	Sun Sep 15 21:02:48 2013 +0200
@@ -134,6 +134,12 @@
             'level': 'DEBUG',
             'propagate': True,
         },
+        'rdflib.term': {
+            'handlers': ['file'],
+            'level': 'DEBUG',
+            'propagate': True,
+        },    
+
     }
 }
 
diff -r 219e27e5e26d -r e30c9bfaf945 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Wed Sep 11 17:52:17 2013 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Sun Sep 15 21:02:48 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 219e27e5e26d -r e30c9bfaf945 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 219e27e5e26d -r e30c9bfaf945 virtualenv/res/src/django-1.5.4-IRI.tar.gz
Binary file virtualenv/res/src/django-1.5.4-IRI.tar.gz has changed