Merge remote-tracking branch 'origin/master' into recrutement
authorPA Parent <paparent@paparent.me>
Fri, 29 Jun 2012 17:31:40 +0000 (13:31 -0400)
committerPA Parent <paparent@paparent.me>
Fri, 29 Jun 2012 17:31:40 +0000 (13:31 -0400)
commit1821f6659cfb63c43af3e63500f65997d2a6e9fa
tree6ee57a9a3349e9353670856ad4ab894b12e9d94e
parent7d326f376f301a976b09c98bcc13f027fb689479
parent26886328103038378fe93264bdad4c9fed2c4413
Merge remote-tracking branch 'origin/master' into recrutement

Conflicts:
buildout.cfg
project/menu.py
buildout.cfg
project/recrutement/admin.py
project/settings.py
versions.cfg