Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Mon, 2 Apr 2012 13:42:53 +0000 (08:42 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Mon, 2 Apr 2012 13:42:53 +0000 (08:42 -0500)
commitb779de28a4cb0a64240fd828002f2b872ed47850
treef0872ba65a4f3a2c621dff0cd2c69c9510ed4847
parented4650ea95f69f666f12ef2f6c3f5b2a95a3c93d
parent5db6ce780bbf6b9a0a096a9157ae06b537ae46cd
Merge remote-tracking branch 'origin/dev' into masse_salariale_jp