Merge branch 'master' into erp5-cluster
authorJulien Muchembled <jm@nexedi.com>
Mon, 8 Dec 2014 17:16:28 +0000 (18:16 +0100)
committerJulien Muchembled <jm@nexedi.com>
Mon, 8 Dec 2014 17:16:28 +0000 (18:16 +0100)
commit55902a949d636eac695c5ca9d6f80761076f8861
treea59a65cd9f6562b2071fa7e5235bdb31ab636cca
parentd9e93ae27eee5ca490474a33039058d92c227880
parent4c5f065ab1d5365f3be431ee3006c372adf5d122
Merge branch 'master' into erp5-cluster
stack/erp5/buildout.cfg