# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1251903493 -19800
# Node ID b6b90b65881f692e9a5d9aaa56a5234d3b8ad977
# Parent  e49daa7af035794ac31efa786c88e5f2ca87a240# Parent  eb8e0031287789bd4ca16abed4d959c4bf66a326
Merged branches.

diff -r eb8e00312877 -r b6b90b65881f urls.py
--- a/urls.py	Wed Sep 02 10:57:07 2009 -0400
+++ b/urls.py	Wed Sep 02 20:28:13 2009 +0530
@@ -1,4 +1,5 @@
 from django.conf.urls.defaults import *
+from django.conf import settings
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin