merge dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 10 Aug 2011 16:10:47 +0000 (12:10 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 10 Aug 2011 16:10:47 +0000 (12:10 -0400)
commitbf4f5c77f5077d7f64c5b4622c06b9aadd90a4a8
tree8dbf4c8152c4d42aae1f0c228e00660d37f8be4d
parenta194e017bbb2f3df4d277c6cae2a957cd2596188
parentb24f48fd1d6495cf50be84e2790de93d43e1d3f9
merge dev
buildout.cfg
project/dae/models.py
project/rh/models.py
project/settings.py
project/urls.py