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)
commit6f9923c9b8f39746b0f3145da671d4bb919b0121
tree62b9232ab595551ead4830412baed84f87214b6f
parent94d705191155f1e63b29eff9b2d5f5fe09e9e36e
parentb24f48fd1d6495cf50be84e2790de93d43e1d3f9
merge from dev
buildout.cfg
project/dae/models.py