Merge branch 'dae' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Fri, 18 Nov 2011 19:44:01 +0000 (14:44 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Fri, 18 Nov 2011 19:44:01 +0000 (14:44 -0500)
commitbb610e655fffecee05a3b1bb562dbeeba236e99b
tree5b9e0701377ea98fbcdac616210f115bc5c1d232
parent02b68f0ed3b855adc02844e1674dbc796e53f305
parent64af14192cdf68d9b3d545c0f83d7e3ff41b10d4
Merge branch 'dae' into test

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