Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 14 Aug 2014 08:01:46 +0000 (10:01 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 14 Aug 2014 08:01:46 +0000 (10:01 +0200)
commit7ba8df74069944f3642df38cddbfb9dc23c0ab58
tree63590da783c3136d094a26e5472d7f6c5bb14a49
parentb146354c0775d259ab4e843a5cef7de2a8cbc09d
parente8548dd967636cb0229adba03081906e9eb65d62
Merge remote-tracking branch 'origin/master' into erp5-cluster
software/mariadb/software.cfg
stack/erp5/buildout.cfg