Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 24 Jun 2013 14:07:59 +0000 (16:07 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 24 Jun 2013 14:07:59 +0000 (16:07 +0200)
commitc04bdf35070d6f06b3f9d002ea8eb370c6613ecb
tree2640d0910ba20570a38dd13794fff3124cc5b38f
parent198c642a5528bfae0eacbe4ffec30d4bf76e68f3
parent837f4bd3cd05cb370034f57c073aa7a5275b147b
Merge branch 'erp5-component' into erp5