Merge branch 'refactoring' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Tue, 5 Jun 2012 14:04:49 +0000 (10:04 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Tue, 5 Jun 2012 14:04:49 +0000 (10:04 -0400)
commitf7a0811da41f4315ffd965541f491b122f2be0bb
tree60e5a5aa0da102508434dfd5e2aa54baf6b8cf21
parent6bf22a136dacea9ce3b9072120088baa7ffe4325
parentce556155862d29bd780e794af381a6674476343a
Merge branch 'refactoring' into test

Conflicts:
project/recrutement/admin.py
buildout.cfg
project/dae/admin.py
project/recrutement/admin.py
project/rh/admin.py
project/rh/models.py
project/rh/views.py
project/settings.py
project/urls.py