Merge branch 'master' into master+ZODB4-wc2

* master:
  Version up erp5.util 0.4.71
  component/haproxy: Version up

component/haproxy/buildout.cfg

@@ -13,8 +13,8 @@ parts = haproxy
 [haproxy]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.24.tar.gz
-md5sum = 493011d81eea0f3700543fc6a80acc03
+url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.25.tar.gz
+md5sum = 44687c901910da46711441ae1611b8ce
 configure-command = true
 # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
 # otherwise use "generic".

stack/slapos.cfg

@@ -224,7 +224,7 @@ atomize = 0.2.0
 croniter = 0.3.25
 dnspython = 1.16.0
 enum34 = 1.1.10
-erp5.util = 0.4.70
+erp5.util = 0.4.71
 feedparser = 5.2.1
 functools32 = 3.2.3.post2
 attrs = 18.2.0