Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 19 Jun 2014 09:36:46 +0000 (11:36 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 19 Jun 2014 09:36:46 +0000 (11:36 +0200)
commitc4f5ca68af31cd9d8461869d70928c33a03c5aa6
tree1e587422d0b851919f03df5a197eb7b38dabd248
parente543010acd2a18db15ac67001a0fc53a8ec311d5
parent334335175db75f5299f939735af7304835287e25
Merge branch 'erp5-component' into erp5