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)
1  2 
project/dae/forms.py
project/dae/models.py
project/dae/views.py

Simple merge
Simple merge
Simple merge