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)
1  2 
project/rh/admin.py

Simple merge