Merge branch 'preprod' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 15 Feb 2012 20:07:45 +0000 (15:07 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 15 Feb 2012 20:07:45 +0000 (15:07 -0500)
commit0fd8c10941b86e97e6bd85ed20d0bf2d92e1e2b3
tree48daa9674bb07c12b2cd3b695014451f487d89a5
parenta975f5fa02deeb718181dcfe85258c254fe70620
parent36231f057ba8e546ece6f85454e1efb0d82cb1e1
Merge branch 'preprod' into dev
project/settings.py