Freeze ERP5 and slapos
Unfreeze ERP5 and slapos
jbigkit : add CVE-2013-6369.patch.
version up eggs.
version up : curl 7.36.0.
explicitly disable innodb_file_per_table in my.cnf.in.

because the default value changed from off to on in MySQL 5.6.6.
Merge remote-tracking branch 'origin/master' into erp5-component
Merge branch 'erp5-component' into erp5