Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 8 Jul 2013 08:09:58 +0000 (17:09 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 8 Jul 2013 08:09:58 +0000 (17:09 +0900)
commitebf2be5de8613c3c78a90d9e7d9fd139417b5cde
tree8a0f40338f22404ef8f56f7017cae386b2306467
parentaeaa6f4b2731e413f60a6225a816122e5fc7c88c
parent2a2f864b8f905732b5b3ab29d6c62ead34d16ccd
Merge branch 'erp5' into erp5-z2.13