Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 10 Jan 2014 09:20:39 +0000 (10:20 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 10 Jan 2014 09:20:39 +0000 (10:20 +0100)
commita66d0ff38a0eb75de5f338d064bc63dd9da67fe5
treea4c0c70b76f4daf8effe860b3eaac629bc601b03
parent37427ee701c9bfebdddb59d17893b4f0e346673b
parentf75d3dbfd653829a1919b8ad226f25ddc15a5155
Merge branch 'erp5-component' into erp5