Merge remote-tracking branch 'master' into erp5testnode
authorSebastien Robin <seb@nexedi.com>
Mon, 16 Apr 2012 08:29:15 +0000 (10:29 +0200)
committerSebastien Robin <seb@nexedi.com>
Mon, 16 Apr 2012 08:29:48 +0000 (10:29 +0200)
commita4925a366c344b90738b0d1d03ced0f0dbd7ed5e
tree2ac0d57b822b61b5edebc7d3c85eecdaeda249fe
parent8e53e3a85702ace3f94a839fe6613c3c69434763
parentd49bf5611797bcfd947f033c68cdca8dae2e4e3f
Merge remote-tracking branch 'master' into erp5testnode

Conflicts:
software/erp5testnode/software.cfg
software/erp5testnode/software.cfg