Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 30 Apr 2014 19:57:31 +0000 (21:57 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 30 Apr 2014 19:57:31 +0000 (21:57 +0200)
commit62e920b7729b844eeff8255babb17191729f7e4b
tree151b54ffb19b82039295e177942d57231af6c433
parent5e7798f85a258f212520d77789eb52162882f8fe
parent601b22918542db0e39c56af6db77f907a363fe61
Merge branch 'erp5-component' into erp5