Merge branch 'master' into dae_refactoring_process
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 15 Nov 2012 15:57:51 +0000 (10:57 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 15 Nov 2012 15:57:51 +0000 (10:57 -0500)
commitc7f54ec6052542ba58881c6048891b94bf547fc4
tree4e0d2bdec35e1e6950bbc7d61e74e06336aed4e6
parent86ecbc57c722861cd9d88929dba4b3d083d71b44
parentc603ea2ea6160bf4a2496e4c393d538e02fc373d
Merge branch 'master' into dae_refactoring_process
project/dae/forms.py
project/dae/models.py
project/dae/views.py