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

Trivial merge