merge master
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 26 Sep 2012 16:20:01 +0000 (12:20 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 26 Sep 2012 16:20:01 +0000 (12:20 -0400)
commit6404ea2a8b432f9def088503edd593bf5efdb34a
treef5e555ec6e8dcf5d710cbc6ebf57582e574e1c4c
parent15da8a54922b3f4bf27d4ab52d766fc9059c72b5
merge master
buildout.cfg
project/conf.py.edit
project/dae/models.py
project/settings.py
versions.cfg