Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 12 May 2014 12:34:26 +0000 (14:34 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 12 May 2014 12:34:26 +0000 (14:34 +0200)
commit7830ebbd8c1e8190c0fd5c89174620e4b711839d
treefaf9ee5418462031604f2823440b98a42c99f142
parentfa06f923fd3f5edb07d0030e3a144fc49df9c313
parentf1089ba5774791680e1a5b5a7d931d873fffea1b
Merge branch 'erp5-component' into erp5