Merge branch 'master' into erp5testnode
authorRomain Courteaud <romain@nexedi.com>
Mon, 4 Jul 2011 10:09:17 +0000 (12:09 +0200)
committerRomain Courteaud <romain@nexedi.com>
Mon, 4 Jul 2011 10:09:34 +0000 (12:09 +0200)
commit1980710a7d4208aba81d0175e11b2e85021f1b50
tree6a691e546ed33437e2d3ae0a44c5cb1943cf47e1
parent346ff3bb81f9664376c581573fd8dcadb8cc9577
parent5b18969ffe4b2742683ad71dc875df0dc128953f
Merge branch 'master' into erp5testnode
software/erp5testnode/software.cfg