Merge branch 'master' into erp5testnode
authorSebastien Robin <seb@nexedi.com>
Fri, 3 Jun 2011 20:45:53 +0000 (22:45 +0200)
committerSebastien Robin <seb@nexedi.com>
Fri, 3 Jun 2011 20:45:53 +0000 (22:45 +0200)
commit4a5ced2e6ff0ea88e0216e3f1f16ffc337bf9cba
treeff4511e0f01db6b9a6f6e93b513f5242e997610a
parent33744e405dbe450ebf5fabfd84dd793b007ba76b
parent7a9fa0f74ad8a3dc739ffeca9399a6e3fc71d666
Merge branch 'master' into erp5testnode