Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 15:33:05 +0000 (17:33 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 15:33:05 +0000 (17:33 +0200)
commitaddb11e5b4dfe29ddf87a8064ebbd5c8e5177b6f
treea8a3850e045cb81d10474647288850041570a624
parent49eccb432a7816d90a9567f324668b6350942f7d
parent36562833d3d5cae531daf8f0444de563f1825fed
Merge branch 'erp5' into erp5-z2.13