Merge remote-tracking branch 'origin/masse_salariale_jp' into test
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Mon, 2 Apr 2012 19:02:45 +0000 (14:02 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Mon, 2 Apr 2012 19:02:45 +0000 (14:02 -0500)

Trivial merge