Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Mon, 2 Apr 2012 13:42:53 +0000 (08:42 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Mon, 2 Apr 2012 13:42:53 +0000 (08:42 -0500)

Trivial merge