Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 29 Mar 2012 21:22:47 +0000 (16:22 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 29 Mar 2012 21:22:47 +0000 (16:22 -0500)
commit5acc1d5bfb68935f1d928e4d6b30c376b9d11d0e
tree62b498e00eedc51fc2a483a773fc0ead54558909
parent9fd09bdc455f2bcd0f0cdae9c85fb1cd79358ec0
parent96c0e7894e4147a447c6df0c674e6d5127e73aa8
Merge remote-tracking branch 'origin/dev' into masse_salariale_jp
project/rh/views.py