Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 13 Dec 2014 19:32:54 +0000 (20:32 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 13 Dec 2014 19:32:54 +0000 (20:32 +0100)
commit190b2e9418bbadd1a02e708f40e823a35d5776bc
tree111e5113ec5f42a17ecfde50fd0f092e3e96cbb2
parent8e7b502cfee8eaa6fd0e7f11db7a50c026a7fff6
parentfd2c4d47ce811dff37aeb2b933cd98e9dd07781c
Merge remote-tracking branch 'origin/master' into erp5-cluster