Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 4 Jun 2015 15:00:22 +0000 (17:00 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 4 Jun 2015 15:00:22 +0000 (17:00 +0200)
commit400ccad4df317bcbee063a95dbcf02c2abfa0278
tree863032256e3d2f55a169709b74349eff65dddf96
parent6555caf4e816a945bfa3f750092b9601809d43d7
parentd0807d90ed132b89c20b159ab0a075a9f4213653
Merge remote-tracking branch 'origin/master' into erp5-cluster