Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 22 Jun 2013 06:33:08 +0000 (08:33 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 22 Jun 2013 06:33:08 +0000 (08:33 +0200)
commit198c642a5528bfae0eacbe4ffec30d4bf76e68f3
tree126a3072ca05fac1dc628cd3f09adb07a0663e3a
parent8c4bc8466115e137898f7cbabf2295f39bf063bd
parent70549203b99263be55a4bbce47b693164785de9f
Merge branch 'erp5-component' into erp5