Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 6 Mar 2013 14:25:58 +0000 (15:25 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 6 Mar 2013 14:25:58 +0000 (15:25 +0100)
commitae0edee8f770a1be66dca219b131b6ee52d8c453
treeaeba4b396e409dd520a745f2a9b6a87c82fe6872
parent91eb144e35b54d8af101cb6f5ec21d3c1ba90c82
parentaae99e196fb6dd7b73182e38aa34a7a22a3b2416
Merge branch 'erp5' into erp5-z2.13