Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 10 May 2014 18:28:05 +0000 (20:28 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 10 May 2014 18:28:05 +0000 (20:28 +0200)
commit9c03cd64b05c7fcdf4415a90fe2f9065b4aa14a5
treede6de180afae5d88b9774f37c4eb6572a2a2a19f
parentdf15148a452c3b208ce4de13da26db1fd605e107
parentfa06f923fd3f5edb07d0030e3a144fc49df9c313
Merge remote-tracking branch 'origin/master' into erp5-cluster
stack/erp5/buildout.cfg