Merge branch 'master' into erp5-cluster
authorJulien Muchembled <jm@nexedi.com>
Tue, 9 Dec 2014 17:59:23 +0000 (18:59 +0100)
committerJulien Muchembled <jm@nexedi.com>
Tue, 9 Dec 2014 17:59:23 +0000 (18:59 +0100)
commita766be5fd16e8665b681db03b2cd7823e2837d1c
treeb89fb2ba0ef29f62ead85662b53a01adca28f62e
parentd2940e88e2f7bc25664f32022f9189bc0d751970
parent8298d98a779b5aa48c067f6cd3c61f35f6c6a45e
Merge branch 'master' into erp5-cluster

Conflicts:
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg