From b4c1d0cbb92d6bbc165ffb3eb6f74d3fdaa8d806 Mon Sep 17 00:00:00 2001
From: substantialnoninfringinguser <substantialnoninfringinguser@gmail.com>
Date: Fri, 15 May 2009 03:38:11 +0100
Subject: [PATCH] [svn] semi ugly hack...

---
 settings.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/settings.py b/settings.py
index e99d199..c69d03f 100644
--- a/settings.py
+++ b/settings.py
@@ -1,4 +1,4 @@
-from localsettings import *
+from localsettings import * #inital localsettings call so that urljoins work
 import os
 import urlparse
 # Django settings for troggle project.
@@ -86,4 +86,6 @@ INSTALLED_APPS = (
     'troggle.profiles',
     'troggle.expo',
     'troggle.imagekit', 
-)
\ No newline at end of file
+)
+
+from localsettings import * #localsettings needs to take precedence. Call it to override any existing vars.
\ No newline at end of file