Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 7 Feb 2014 09:15:19 +0000 (10:15 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 7 Feb 2014 09:15:19 +0000 (10:15 +0100)
commit3b3bdb89a5113f35ab73a2c02ba0b2fcd14eb049
tree17241b912c9d1fd8f9d52850895d675577cc54c5
parent22db977298fc798e42bd042bde398b63feffbe0f
parent5d3f7c316f6a54b68b559a98914cba4b647ff9bd
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg