Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 28 Mar 2012 17:03:52 +0000 (12:03 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 28 Mar 2012 17:03:52 +0000 (12:03 -0500)
commit41c93d6cbdc4190552cc938225c7d17a516acf7b
tree8fe6cfe129cf52c4d2e46307d2f704061056320b
parentf14d4bc7ad7cb179d254e12262dc8d2274d58a99
parentaecb222b97335e9d1d0ec6c3e0060e9a99a327f3
Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
project/rh/masse_salariale.py