Merge remote-tracking branch 'origin/master' into recrutement

Conflicts:
	buildout.cfg
	project/menu.py

diff --cc buildout.cfg
index 50ed453,076ff10..b13bc30
--- 1/buildout.cfg
--- 2/buildout.cfg
+++ b/buildout.cfg
@@@ -13,9 -13,9 +13,10 @@@ find-links = http://pypi.auf.org/simple
      http://pypi.auf.org/simple/auf.django.admingroup/
      http://pypi.auf.org/simple/auf.django.permissions/
      http://pypi.auf.org/simple/auf.django.emploi/
 +    http://pypi.auf.org/simple/auf.django.export/
-     http://pypi.auf.org/django-alphafilter/
      http://pypi.auf.org/simple/auf.django.references/
+     http://pypi.auf.org/simple/django-alphafilter/
+     http://pypi.auf.org/simple/odsgen/
  develop = src/qbe
      src/auf.django.metadata
  eggs =

diff --cc project/recrutement/admin.py
Simple merge

diff --cc project/settings.py
Simple merge

diff --cc versions.cfg
index 6e7682f,63272ae..c74e337
--- 1/versions.cfg
--- 2/versions.cfg
+++ b/versions.cfg
@@@ -60,8 -59,11 +59,14 @@@ 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
+ 
+ # Added by Buildout Versions at 2012-06-15 14:24:42.911205
+ odsgen = 0.1
+ 
+ # Added by Buildout Versions at 2012-06-18 15:34:10.516016
+ auf.django.references = 0.19