Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 27 Mar 2012 19:22:23 +0000 (14:22 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 27 Mar 2012 19:22:23 +0000 (14:22 -0500)
1  2 
project/rh/masse_salariale.py

Simple merge