Merge branch 'refactoring' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Tue, 5 Jun 2012 15:07:05 +0000 (11:07 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Tue, 5 Jun 2012 15:07:05 +0000 (11:07 -0400)
commit294866db65f535923dc6de0dbb300a2b21b472a4
tree5658a02046052bc4f2253f08613bb04ab0d1ffdf
parentf7a0811da41f4315ffd965541f491b122f2be0bb
parent8b3f6ff5773ee23c47e3399dc148d862f3dda97c
Merge branch 'refactoring' into test

Conflicts:
project/settings.py
project/menu.py
project/recrutement/admin.py
project/rh/admin.py
project/rh/views.py
project/settings.py