Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Apr 2014 12:22:06 +0000 (14:22 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Apr 2014 12:22:06 +0000 (14:22 +0200)
commit64e278861690a542c31224eef0252f8ed8b5a9c4
treece48efb220a41c5e808bd3b19ae0eca61f6026ed
parent48478a8e0f8fe2cb553a1983a97f0f826eee0bf1
parentbd9b73140faf237ec482344845658d003201279e
Merge remote-tracking branch 'origin/master' into erp5-cluster
stack/erp5/buildout.cfg