Merge branch 'dev', remote-tracking branch 'origin' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 16 Mar 2012 14:30:47 +0000 (09:30 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 16 Mar 2012 14:30:47 +0000 (09:30 -0500)
1  2 
project/rh/views.py

Simple merge