Merge branch 'master' into test
authordavin baragiotta <davin.baragiotta@u-db.(none)>
Tue, 22 Feb 2011 23:08:03 +0000 (18:08 -0500)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Tue, 22 Feb 2011 23:08:03 +0000 (18:08 -0500)
1  2 
project/settings.py

Simple merge