Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Oct 2013 09:00:01 +0000 (11:00 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Oct 2013 09:00:01 +0000 (11:00 +0200)
commitd10e469b6773c63e35c7ecfab7e29531c943ea14
tree4e4b77e6f7469cd16acd861a3c4833ac0b04bb48
parent000da518f0f9faec4828484fed0d32afb8daa8bb
parent25e015c28377bd52517fb71e1d1f618d0a817128
Merge branch 'erp5-component' into erp5