Merge branch 'dae' into test

Conflicts:
	buildout.cfg

diff --cc buildout.cfg
index 8d57c20,e79f25e..a665798
--- 1/buildout.cfg
--- 2/buildout.cfg
+++ b/buildout.cfg
@@@ -26,20 -22,8 +26,13 @@@ eggs 
      django-reversion
      simplejson
      django-ajax-selects
 +    django-form-utils
 +    django-tinymce
 +    django-simple-captcha
 +    auf.django.metadata
 +    django-alphafilter
      django-sendfile
  
- # LA PROD ne dispose que de reportlab 2.1, incompatible avec
- # les versions de pisa assez évoluées pour un bon rendu.
- #    reportlab
- #    html5lib
- #    pyPDF
- #    pisa
- 
  [versions]
  django-admin-tools = 0.4.0
  django = 1.2.5
@@@ -50,12 -33,7 +43,9 @@@ auf.django.metadata = 0.2de
  django-reversion = 1.3.3
  auf.django.workflow = 0.14dev
  django-ajax-selects = 1.1.4
 +django-alphafilter = 0.5.3auf4
 +auf.django.emploi = 0.5dev
- #reportlab = 2.5
- #html5lib = 0.90
- #pyPDF = 1.13
- #pisa = 3.0.33
+ django-sendfile = 0.2.1
  
  [django]
  recipe = auf.recipe.django

diff --cc project/dae/templates/dae/embauche_consulter.html
Simple merge