Merge branch 'master' into recrutement
authorPA Parent <paparent@paparent.me>
Wed, 18 Jul 2012 14:39:38 +0000 (10:39 -0400)
committerPA Parent <paparent@paparent.me>
Wed, 18 Jul 2012 14:39:38 +0000 (10:39 -0400)
commitd5f538ec501a1357555a4eba69613cd4c4e03b62
tree8eb8ce43a158266ae0a2e7316fa5e88f3dbc45a9
parent39d9d505a2b4f2af93c44da8837650f05e3e2ad1
parenta30f55e79520afbb42e0178c10e063a1ff9e6f71
Merge branch 'master' into recrutement

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