merge from dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 10 Aug 2011 14:21:02 +0000 (10:21 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 10 Aug 2011 14:21:02 +0000 (10:21 -0400)
1  2 
buildout.cfg
project/dae/models.py

diff --cc buildout.cfg
Simple merge
Simple merge