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)
commit815715705a7a6edfeaa18879c30b864677497541
tree26fae407d29dce378e4924ac0e4ab298d313452f
parentfad313dbbeb6026b78547fbe284cc3bd9e16064d
parent892a50fd99f2506664f1699024d673fd39765c65
Merge branch 'hotfix/salaire_base_bug' into dev
project/dae/forms.py