Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 13 Mar 2013 07:15:50 +0000 (08:15 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 13 Mar 2013 07:15:50 +0000 (08:15 +0100)
commitdc2f2db7d69c1f815dc28d007560191ee302d789
treed64fc736e01f68a7d289505bd7e2d27e996aadd2
parent6124e1d64963d75a5fa1d4d69327dc69dcba49b4
parentf0153580422c2968f8ce86bc8b4499d89c92f695
Merge branch 'erp5' into erp5-z2.13