Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 28 Mar 2012 13:26:03 +0000 (08:26 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 28 Mar 2012 13:26:03 +0000 (08:26 -0500)

Trivial merge