Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 4 Jun 2014 08:02:46 +0000 (10:02 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 4 Jun 2014 08:02:46 +0000 (10:02 +0200)
commita13aa12e530a8c3c2774f1793b3d91247da9bac9
treee287151facacdeaecc577a6a5b50aa1d71003919
parent6fca371972a98bd436f9045f4db2428dc111997c
parentc55f26bc8514888027b1fa2ea19ec246050f2d70
Merge remote-tracking branch 'origin/master' into erp5-component