Merge branch 'rh' into dev
authordavin baragiotta <davin.baragiotta@u-db.(none)>
Tue, 5 Apr 2011 13:21:33 +0000 (09:21 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Tue, 5 Apr 2011 13:21:33 +0000 (09:21 -0400)
1  2 
project/settings.py
project/urls.py

Simple merge
diff --cc project/urls.py
Simple merge