Merge branch 'hotfix' into recrutement
authorPA Parent <paparent@paparent.me>
Fri, 8 Jun 2012 15:19:05 +0000 (11:19 -0400)
committerPA Parent <paparent@paparent.me>
Fri, 8 Jun 2012 15:19:05 +0000 (11:19 -0400)
Conflicts:
versions.cfg

1  2 
versions.cfg

diff --cc versions.cfg
@@@ -61,5 -60,5 +60,8 @@@ setuptools = 0.6c12dev-r8884
  # Added by Buildout Versions at 2012-05-30 13:39:28.023002
  django-picklefield = 0.2.1
  
 +# Added by Buildout Versions at 2012-06-06 10:42:23.231268
 +auf.django.export = 0.3
++
+ # Added by Buildout Versions at 2012-06-08 11:15:52.545562
+ auf.django.emploi = 1.2dev