Merge branch 'master' into erp5testnode
authorSebastien Robin <seb@nexedi.com>
Tue, 14 Jun 2011 06:49:36 +0000 (08:49 +0200)
committerSebastien Robin <seb@nexedi.com>
Tue, 14 Jun 2011 06:49:36 +0000 (08:49 +0200)
commit70d78c20218e9ae6eb34043097d4f97de3077cf2
treed9db8c0e98ceb4b9703eb5430b0dc7ee223bb6d1
parent8289bfb3ed934c25ab748566794fc802e7a02baa
parentd2d282435f4b59ea815682e1e662d6e8addf85bb
Merge branch 'master' into erp5testnode