Merge branch 'hotfix/salaire_base_bug'
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 11 Apr 2013 18:21:50 +0000 (14:21 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 11 Apr 2013 18:21:50 +0000 (14:21 -0400)
commit54e18c2f4c2d2078fd3b9d9434e6f1b390bf03f3
tree8cacd166545a9176698fa430d2d7c50441686816
parentad87f67868e277bc0fde21bfd6c7625a570ecded
parent892a50fd99f2506664f1699024d673fd39765c65
Merge branch 'hotfix/salaire_base_bug'