Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 8 Apr 2011 16:53:50 +0000 (12:53 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 8 Apr 2011 16:53:50 +0000 (12:53 -0400)
1  2 
project/dae/forms.py
project/dae/models.py

Simple merge
Simple merge