Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 15 Jul 2014 08:09:40 +0000 (17:09 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 15 Jul 2014 08:09:40 +0000 (17:09 +0900)
commitb29d72897411cf98c52a25483127eeabf4601f6c
tree467ddcf410a67c805fa1331166c687b4831fc457
parentcbbabdf97900e61584610ac385a65e675bf2eb47
parent981afc6aaa46a0f9b4aface8a1fa61f9bea32bc6
Merge remote-tracking branch 'origin/master' into erp5-component