Merge branch 'dev' into rh
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 6 Jun 2011 14:01:01 +0000 (10:01 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 6 Jun 2011 14:01:01 +0000 (10:01 -0400)
1  2 
buildout.cfg
project/rh/models.py
project/settings.py

diff --cc buildout.cfg
Simple merge
Simple merge
Simple merge