Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 17 Jun 2014 18:42:07 +0000 (20:42 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 17 Jun 2014 18:42:07 +0000 (20:42 +0200)
commitf51d21f91bcfc5b2d6c9771787aff307a1dc860b
treef675b856fc919b086147f1cdb5f815f653a4bf63
parent6d74d3b8ce62b6b5a3681d23f25f915eb26d134e
parente543010acd2a18db15ac67001a0fc53a8ec311d5
Merge remote-tracking branch 'origin/master' into erp5-cluster
software/mariadb/software.cfg
stack/erp5/buildout.cfg