Merge branch 'erp5'

component/mariadb/buildout.cfg

@@ -25,10 +25,10 @@ download-only = true
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 5.5.30
+version = 5.5.31
 revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = 39d4da4dabc8bda012517b3587dee6f8
+md5sum = 3fe756bc76f0e7a3af2757e48ce0f3f4
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0