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

Simple merge