Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 17 Apr 2013 13:09:33 +0000 (15:09 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 17 Apr 2013 13:09:33 +0000 (15:09 +0200)
commit9febc1e412ed2979652bf939ce1f7d80e367eba5
tree75d860bddc6dceedefe4cc4f77b8fa282264dc75
parentdc6787549a05ebf4b6c6b1aefab7ca353052f04a
parent911b6b1b8f4d2fc51c9ce279994aeac35359badc
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg