Merge remote-tracking branch 'origin/recrutement' into recrutement
authorPA Parent <paparent@paparent.me>
Tue, 5 Jun 2012 20:55:23 +0000 (16:55 -0400)
committerPA Parent <paparent@paparent.me>
Tue, 5 Jun 2012 20:55:23 +0000 (16:55 -0400)
commitd0b1a7520d340600838089b3d238bd2e56b9099d
tree16c557e36df4e62ae0215f71fc43b9199bb2adf9
parent0b9dea96b2a6b2f702d422daba1eaa14d935addc
parentf427129b3ca4c383c600be36a4fde52ebb723b9a
Merge remote-tracking branch 'origin/recrutement' into recrutement

Conflicts:
project/recrutement/admin.py
project/recrutement/admin.py