Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 20 May 2014 21:34:18 +0000 (23:34 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 20 May 2014 21:34:18 +0000 (23:34 +0200)
commitb0800ffc1eaf19dd6401d41d1c0735df258932ff
treead2c1df4033e28bd3f34986ce62bccaa88fd3080
parent56b3be0c907771e3330a2779bde66eb94d05eab4
parent270ef927e92ce0b993de56c97b3794d0e26f1961
Merge branch 'erp5-component' into erp5