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

diff -r e49daa7af035 -r b6b90b65881f apache/django.wsgi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/apache/django.wsgi	Wed Sep 02 20:28:13 2009 +0530
@@ -0,0 +1,10 @@
+import os
+import sys
+
+sys.path.append('/home/hg/repos/')
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'spoken_tut.settings'
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
+
diff -r e49daa7af035 -r b6b90b65881f settings.py
--- a/settings.py	Wed Sep 02 20:27:41 2009 +0530
+++ b/settings.py	Wed Sep 02 20:28:13 2009 +0530
@@ -1,5 +1,7 @@
 # Django settings for spoken_tut project.
 
+import os
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -14,7 +16,7 @@
 
 DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
 DATABASE_NAME = 'uploads'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'nme_ict'             # Not used with sqlite3.
+DATABASE_USER = 'spoken'             # Not used with sqlite3.
 DATABASE_PASSWORD = 'NotMeICT'         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.