Merge branch 'refactoring' of git.auf.org:auf_rh_dae into refactoring
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 30 May 2012 18:41:43 +0000 (14:41 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 30 May 2012 18:41:43 +0000 (14:41 -0400)
commite949324bb892460d2d9674f59cf755dfc96b8f6f
tree975c750e8e2973ca78c59749ccbc69cb45bc851b
parent4ba84959e405a7e1707b95106b9d658b47af1644
parent75f0e87b74950319307b3ff6ff70941d1ec08954
Merge branch 'refactoring' of git.auf.org:auf_rh_dae into refactoring

Conflicts:
project/recrutement/admin.py
project/recrutement/views.py
project/rh/catalogues.py
project/rh/masse_salariale.py
project/rh/views.py
project/dae/models.py
project/recrutement/admin.py
project/recrutement/models.py
project/recrutement/views.py
project/rh/catalogues.py
project/rh/masse_salariale.py
project/rh/models.py
project/rh/views.py