Merge branch 'hotfix/salaire_base_bug' into dev
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 11 Apr 2013 18:21:59 +0000 (14:21 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 11 Apr 2013 18:21:59 +0000 (14:21 -0400)
1  2 
project/dae/forms.py

Simple merge