Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 5 Apr 2013 11:58:35 +0000 (13:58 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 5 Apr 2013 11:58:35 +0000 (13:58 +0200)
commit5ca33bc82ace89a7150d0133c882f6242b2c99fb
treec83ff28cd4681d494e21a70fc264188f83ace0c7
parent9efa1ae1ee718822a50d8e3505aa5c274ee2f0d9
parentb11c026a7497fa7638a4eb67696ed736f2a59174
Merge branch 'erp5-component' into erp5