Merge branch 'test' into dev

Conflicts:
	auf_savoirs_en_partage/savoirs/models.py
	buildout.cfg
	versions.cfg

diff --cc buildout.cfg
index 0e74473,9cc207f..c2cc850
--- 1/buildout.cfg
--- 2/buildout.cfg
+++ b/buildout.cfg
@@@ -2,9 -2,11 +2,13 @@@
  extends = versions.cfg
  extensions = buildout-versions
  buildout_versions_file = versions.cfg
++<<<<<<< HEAD
++=======
+ parts = django articles harvest sphinx_config alertes_courriel
++>>>>>>> test
  versions = versions
 +parts = django articles harvest sphinx_config alertes_courriel
  find-links =
 -    http://pypi.auf.org/auf_references_client/
 -    http://pypi.auf.org/auf_references_modeles/
      http://pypi.auf.org/django-roa/
      http://pypi.auf.org/django_exportateur/
      http://pypi.auf.org/auf.django.admingroup/

diff --cc versions.cfg
index d530211,9ba5bab..f66270b
--- 1/versions.cfg
--- 2/versions.cfg
+++ b/versions.cfg
@@@ -1,5 -1,12 +1,10 @@@
  [versions]
- auf.recipe.django = 1.1
 -
+ # Versions installées sur le serveur de prod
+ MySQL-python = 1.2.2
+ lxml = 2.2.8
+ 
+ # Versions sélectionnées avant l'utilisation de buildout-versions
+ auf.recipe.django = 1.7
 -django = 1.2.5
  auf_references_client = 0.4.9
  Babel = 0.9.5
  caldav = 0.1.12
@@@ -22,10 -30,9 +28,9 @@@ auf.django.auth = 0.5.5de
  auf.django.references = 0.5
  django-alphafilter = 0.5.3auf4
  django-selectable = 0.2
- python-memcached = 1.48
  
 -
 -# Added by Buildout Versions at 2012-04-26 10:19:09.922639
 +# Added by Buildout Versions at 2012-04-04 16:37:49.534685
 +Django = 1.4
  auf-references-client = 0.4.9
  buildout-script = 0.2a1
  buildout-versions = 1.7
@@@ -73,9 -84,6 +82,9 @@@ vobject = 0.8.1
  zc.buildout = 1.5.2
  
  # Required by:
- # auf.recipe.django==1.1
+ # auf.recipe.django==1.7
  # djangorecipe==1.1.2
  zc.recipe.egg = 1.3.2
 +
 +# Added by Buildout Versions at 2012-04-17 18:07:32.342631
 +django-admin-tools = 0.4.1