Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 15:47:16 +0000 (17:47 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 15:47:16 +0000 (17:47 +0200)
commit24d8326b0d9dc4fa962c1f8aa113901450521002
treed7e2882dbebad3b166ca77cd23edce77a5195744
parentaddb11e5b4dfe29ddf87a8064ebbd5c8e5177b6f
parentf7ede01a96fc895d8bf1e282adbc1f5b159c46e1
Merge branch 'erp5' into erp5-z2.13