Merge branch 'dae' into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Fri, 18 Nov 2011 19:43:23 +0000 (14:43 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Fri, 18 Nov 2011 19:43:23 +0000 (14:43 -0500)
commitadc26ab74d916357c320fdbc2b31e95492c5683f
tree4e14b1cd18568ddce6ffb6037f7d4fdfaf53ed09
parent6b129ee26e41d0c3f7fe046fa1bd256e59f03381
parent64af14192cdf68d9b3d545c0f83d7e3ff41b10d4
Merge branch 'dae' into dev

Conflicts:
buildout.cfg
buildout.cfg
project/dae/templates/dae/embauche_consulter.html