Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 29 Mar 2012 15:47:07 +0000 (10:47 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 29 Mar 2012 15:47:07 +0000 (10:47 -0500)

Trivial merge