Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 10 Jul 2015 02:15:40 +0000 (11:15 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 10 Jul 2015 02:15:40 +0000 (11:15 +0900)
commit5710fa7cd96f7a462b0fa9bfd091492e29b8db05
tree29f7858b2c1c7de2ffc5aacfe66fad74f5dda96d
parent5f73dc98cd46c4b18bf9aeb21442c2fadc5012b3
parentdeb17caa6aabfc0696c1e89ba19b728e2fcd5e93
Merge remote-tracking branch 'origin/master' into erp5-cluster