[SCM] live-studio branch, master, updated. 47bbabbccf60b66a17cf892768e7376a6394dc53

[Chris Lamb]

The following commit has been merged in the master branch:
commit 4a8fa0587a6d09b926595430050d768f04d5d2b2
Author: Chris Lamb <lamby at debian.org>
Date:   Fri Jul 30 15:54:28 2010 -0400

    Move TEMPLATE_LOADERS to settings.defaults.templates

diff --git a/live_studio/settings/defaults/misc.py b/live_studio/settings/defaults/misc.py
index ba2062a..a4ae386 100644
--- a/live_studio/settings/defaults/misc.py
+++ b/live_studio/settings/defaults/misc.py
@@ -50,12 +50,6 @@ ADMIN_MEDIA_PREFIX = '/admin/media/'
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'st3nklmujoic*e63$^7*f6d^0i*zva4^80^65=wm7fbb4a4i$p'
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-)
-
 ROOT_URLCONF = 'live_studio.urls'
 
 LOGIN_REDIRECT_URL = '/configs'
diff --git a/live_studio/settings/defaults/templates.py b/live_studio/settings/defaults/templates.py
index 85aae36..3babd6a 100644
--- a/live_studio/settings/defaults/templates.py
+++ b/live_studio/settings/defaults/templates.py
@@ -8,3 +8,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.messages.context_processors.messages',
     'live_studio.auth.context_processors.settings_context',
 )
+
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.load_template_source',
+    'django.template.loaders.app_directories.load_template_source',
+)

-- 
live-studio