Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 17 Apr 2013 13:08:59 +0000 (15:08 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 17 Apr 2013 13:08:59 +0000 (15:08 +0200)
commit911b6b1b8f4d2fc51c9ce279994aeac35359badc
treee9445227cdc3f20de666acbe43a76ef4a32fdec9
parent5ca33bc82ace89a7150d0133c882f6242b2c99fb
parentb6d7f3e869a8ed6689f700c206a98f226b9dc6d7
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg