Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 30 Mar 2012 14:39:25 +0000 (09:39 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 30 Mar 2012 14:39:25 +0000 (09:39 -0500)

Trivial merge