Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Apr 2014 07:30:18 +0000 (09:30 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Apr 2014 07:30:18 +0000 (09:30 +0200)
commit9ad59e62d3bcb34c98bd29f5b78e8f99146733c3
treeec745928dce598a0a61daa4ac9d3aac2c3dcc4f7
parentf6a391f2e53ffba3d536db2f93f9cbdea8a0195f
parentb55db998452d3b46e83e1cac9a398462d8e6d596
Merge branch 'erp5-component' into erp5