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

software/ipython_notebook/software.cfg

@@ -7,7 +7,6 @@ extends =
   ../../component/scipy/buildout.cfg
   ../../component/scikit-learn/buildout.cfg
   ../../component/pandas/buildout.cfg
-  ../../component/manpy/buildout.cfg
   ../../component/openssl/buildout.cfg
 parts =
   monitor-eggs
@@ -23,9 +22,6 @@ eggs +=
   ${scipy:egg}
   ${pandas:egg}
   ${scikit-learn:egg}
-  ${manpy:eggs}
-initialization +=
-  ${manpy:initialization}
 
 [ipython_notebook_config]
 recipe = hexagonit.recipe.download

software/wendelin/software.cfg

 [buildout]
 extends =
-  ../../component/manpy/buildout.cfg
   ../../software/ipython_notebook/software.cfg
   ../../component/fluentd/buildout.cfg
   ../../component/matplotlib/buildout.cfg
@@ -22,7 +21,6 @@ parts +=
   matplotlib
   fluentd
   ipython_notebook
-  manpy
 
 [eggs]
 initialization =

stack/slapos.cfg

@@ -105,7 +105,7 @@ eggs =
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.7.1.post9
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
-zc.recipe.egg = 1.3.2.post3
+zc.recipe.egg = 1.3.2.post4
 # Use own version of h.r.download to be able to open .xz and .lz archives
 hexagonit.recipe.download = 1.7.post4