Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 15:46:37 +0000 (17:46 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 15:46:37 +0000 (17:46 +0200)
commitf7ede01a96fc895d8bf1e282adbc1f5b159c46e1
treeaf55b4c4b5851286547bcc006fb00dd032e54cfa
parent36562833d3d5cae531daf8f0444de563f1825fed
parentd5a61f7fd5e9bee02697b076bb7c1ae3154b2154
Merge branch 'erp5-component' into erp5