Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 20 Mar 2012 19:56:29 +0000 (14:56 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 20 Mar 2012 19:56:29 +0000 (14:56 -0500)

Trivial merge