Merge remote-tracking branch 'origin/master' into erp5-component

component/slapos/buildout.cfg

@@ -144,7 +144,7 @@ zc.recipe.egg = 1.3.2
 # Use own version of h.r.download to be able to open archives not supported by python2.x: .xz
 hexagonit.recipe.download = 1.7nxd002
 
-slapos.core = 1.0.0
+slapos.core = 1.0.2.1
 Jinja2 = 2.7.1
 MarkupSafe = 0.18
 Pygments = 1.6
@@ -166,33 +166,33 @@ xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==1.0.0
+# slapos.core==1.0.2.1
 Flask = 0.10.1
 
 # Required by:
-# slapos.core==1.0.0
+# slapos.core==1.0.2.1
 bpython = 0.12
 
 # Required by:
-# slapos.core==1.0.0
+# slapos.core==1.0.2.1
 cliff = 1.4.5
 
 # Required by:
-# slapos.core==1.0.0
+# slapos.core==1.0.2.1
 ipython = 1.1.0
 
 # Required by:
-# slapos.core==1.0.0
+# slapos.core==1.0.2.1
 netifaces = 0.8
 
 # Required by:
-# slapos.core==1.0.0
+# slapos.core==1.0.2.1
 requests = 2.1.0
 
 # Required by:
-# slapos.core==1.0.0
+# slapos.core==1.0.2.1
 supervisor = 3.0
 
 # Required by:
-# slapos.core==1.0.0
+# slapos.core==1.0.2.1
 zope.interface = 4.0.5