Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 21 Mar 2013 08:34:09 +0000 (09:34 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 21 Mar 2013 08:34:09 +0000 (09:34 +0100)
commitad2c26dca38600df65a658bf7c94de2a0c5762da
treee567e13366d9ac2dc3ee90f52ff528aca57aa40b
parent7f6988dc5c769a22ea26bb69b7c335133c9c7439
parent627226ab177db22bba7e6913486a82c508f94b3c
Merge branch 'master' into erp5-component
stack/erp5/buildout.cfg