Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 5 Jul 2013 12:39:08 +0000 (14:39 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 5 Jul 2013 12:39:08 +0000 (14:39 +0200)
commitaeaa6f4b2731e413f60a6225a816122e5fc7c88c
treecbfa65e07342c484c85d07cfcf3929b570b64f4e
parent33c9775eedd3ff9da7948f49ff99053f85d37940
parent8732f703ae70f2d5b7623cdaf0af73f76c9ee453
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg