Merge branch 'masse-salariale' into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Fri, 15 Jun 2012 19:34:23 +0000 (15:34 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Fri, 15 Jun 2012 19:34:23 +0000 (15:34 -0400)
commita623d1b206a2fd29ae4861109b1019036cc18adc
tree3bb7478b9a59dd55ac84eed5e913bfa86d69ce1d
parent4b7fca4e7f156f0022d36ae58259f3830563d484
parentff9bc43d465f16f1046693251dcc8be527cad529
Merge branch 'masse-salariale' into dev

Conflicts:
project/rh/views.py
project/rh/models.py
project/rh/views.py
project/settings.py