Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 13 May 2013 07:09:30 +0000 (09:09 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 13 May 2013 07:09:30 +0000 (09:09 +0200)
commit1179c76573d2a447cf2261aa2f76c4b17c0bc94b
tree7ab7d99b87be7ac84e6719899fdd6206dcc45ab2
parentcc55bfa923ef407f802278ffd86b27081db45bd0
parentce15c54d3acaace0681cc134086da7bc3e5bad97
Merge branch 'erp5-component' into erp5