Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 15 May 2014 12:05:17 +0000 (14:05 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 15 May 2014 12:05:17 +0000 (14:05 +0200)
commit59743897c35041b311ffc6cd28bdbebbded0a1f8
treecbcac0ce8a906faea52b16dba15ecac400b0fc02
parent9060224e8a32afa176c9c4e1c56f5bf9c48aed2a
parent3365305c3aaca1f85f8ba5f167137f924ac35ab0
Merge remote-tracking branch 'origin/master' into erp5-cluster
stack/erp5/buildout.cfg