# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1257371646 -19800
# Node ID e0b9c2f8c43341d3a7a90abe3155ea0e22bf9d63
# Parent  bffb109e23c1074ec1b1b309192f46ea2c8674ac# Parent  f6851340fc739ff3be6219b3a89cfa0dd125870f
Merged Mainline and Madhu branches.

diff -r bffb109e23c1 -r e0b9c2f8c433 .hgignore
--- a/.hgignore	Thu Nov 05 03:19:10 2009 +0530
+++ b/.hgignore	Thu Nov 05 03:24:06 2009 +0530
@@ -38,4 +38,5 @@
 project/media/user/*
 project/static/media
 project/kiwipycon/user/*.pyc
+apache/*
 
diff -r bffb109e23c1 -r e0b9c2f8c433 buildout.cfg
--- a/buildout.cfg	Thu Nov 05 03:19:10 2009 +0530
+++ b/buildout.cfg	Thu Nov 05 03:24:06 2009 +0530
@@ -61,7 +61,7 @@
 
 [django-command-extensions]
 recipe = zerokspot.recipe.git
-repository = http://github.com/django-extensions/django-extensions.git
+repository = git://github.com/django-extensions/django-extensions.git
 
 [south]
 recipe = infrae.subversion
diff -r bffb109e23c1 -r e0b9c2f8c433 production.cfg
--- a/production.cfg	Thu Nov 05 03:19:10 2009 +0530
+++ b/production.cfg	Thu Nov 05 03:24:06 2009 +0530
@@ -2,5 +2,6 @@
 extends =
     buildout.cfg
 
-eggs +=
-    psycopg2
+#eggs +=
+#    psycopg2
+#
\ No newline at end of file
diff -r bffb109e23c1 -r e0b9c2f8c433 project/production.py
--- a/project/production.py	Thu Nov 05 03:19:10 2009 +0530
+++ b/project/production.py	Thu Nov 05 03:24:06 2009 +0530
@@ -1,7 +1,10 @@
 #django
 from project.settings import *
 
-SITE_ID = 2
+DEBUG=True
+TEMPLATE_DEBUG=DEBUG
+
+SITE_ID = 1 
 
 INSTALLED_APPS = (
     'django.contrib.auth',
@@ -23,10 +26,11 @@
     'basic.media',
     'django_extensions',
     'south',
+    'registration',
 )
 
-DATABASE_ENGINE = 'postgresql_psycopg2'
-DATABASE_NAME = 'kpc09'
-DATABASE_USER = 'kpc09'
+DATABASE_ENGINE = 'mysql'
+DATABASE_NAME = 'conference2009'
+DATABASE_USER = 'root'
 # Imports DATABASE_PASSWORD from project/local.py that is not part of mercurial repo
 from project.local import DATABASE_PASSWORD