Merge branch 'master' into recrutement
authorPA Parent <paparent@paparent.me>
Tue, 10 Jul 2012 17:56:10 +0000 (13:56 -0400)
committerPA Parent <paparent@paparent.me>
Tue, 10 Jul 2012 17:56:10 +0000 (13:56 -0400)
commitcf05574b6da589d02c4b1b3574e7ece0b6973199
tree015e15751bf8ea6fd44fe3db9b3a272f063856c7
parent67ad65fb9e8202b0867b9e2a317e26dabaa74b5b
parentc3550a05800f9cce7011f3c61c72369b9e354c9e
Merge branch 'master' into recrutement

Conflicts:
project/recrutement/admin.py
project/dashboard.py
project/recrutement/admin.py
project/recrutement/views.py
project/settings.py
versions.cfg