Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 10 Jul 2015 02:09:32 +0000 (11:09 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 10 Jul 2015 02:09:32 +0000 (11:09 +0900)
commit5f73dc98cd46c4b18bf9aeb21442c2fadc5012b3
treea2437b4ad54097467fbdeace52bfc98322c35c2e
parentd8ccc6fde15df90c618bfffee1d49fbb0f0e0d50
parentbb9699ee81ec02af6271fdfd0e959c62b474cc56
Merge remote-tracking branch 'origin/master' into erp5-cluster