Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 22 Jul 2014 15:52:34 +0000 (00:52 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 22 Jul 2014 15:52:34 +0000 (00:52 +0900)
commit882ee66aee186df4824110c0b0f42e4509049099
tree3eb6a31779707c8980bd141c5b2f12c253f51d20
parent8eb31ed16a82a1b6b4136ebfa1322c715e66d9d8
parentc58f534d0c32492bd68846d2b6e3f6affce959b6
Merge remote-tracking branch 'origin/master' into erp5-component