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)
commit05e60de5274c96893d820b0a2385c976f6807da7
tree5e0ecd1c2becbbece4bd6332f61a22de65665f8d
parent1c7d67ce90f81db68f9e6f8b1c70a483087f0151
parent3ae24bdcea20271b93b8ab0fddb4d7a83a7d0573
Merge branch 'rh' into dev
project/settings.py
project/urls.py