Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 9 Mar 2015 16:11:45 +0000 (17:11 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 9 Mar 2015 16:11:45 +0000 (17:11 +0100)
commitc4e21a4f9c47a76a4157141a6adf39cbee6db7e0
treeb3dd458f9be18fa90d5ed436a812e680117a2005
parent855cbfa4fc7fe361f4727cef15e6fa259cbdc647
parent0475eef950d1209437680fd447366d9c631497bb
Merge remote-tracking branch 'origin/master' into erp5-cluster
stack/erp5/buildout.cfg