Merge remote-tracking branch 'origin/hotfix' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 29 Mar 2012 19:32:48 +0000 (14:32 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 29 Mar 2012 19:32:48 +0000 (14:32 -0500)
commit0567882bb4dee297cc8a426ff46ff30361ceef8f
tree5d647fe51ca6588940b74d1ea1217099d6669d1f
parentd9c52f54de750c151b74eb3c3d91d610625f1d60
parented5ee2f9ba3fbc439c30a925963a417de2c4ce80
Merge remote-tracking branch 'origin/hotfix' into masse_salariale_jp
project/rh/admin.py