Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 18 Jul 2014 03:43:11 +0000 (12:43 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 18 Jul 2014 03:43:11 +0000 (12:43 +0900)
commit939a672167d231b6b4d8bd165accda7d8835ba96
tree3a7191cadc21568509e38bbacae6e2eb947a23f0
parentb29d72897411cf98c52a25483127eeabf4601f6c
parentf19677695a87d33ff3fce37f2fa80b4e3e6e5301
Merge remote-tracking branch 'origin/master' into erp5-component