Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 08:38:09 +0000 (09:38 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 08:38:09 +0000 (09:38 +0100)
commit8a5ac1573960d6c2c2ec2eed62f88348c219234a
tree4bcfc0b5be19e5a3143012d8bfc2c06d8ee6247d
parent11fdd0709539db9b6679c30c7dbb026c960b9027
parentd98c8aef8762ef50c7cef389ec467320ada56bc2
Merge branch 'erp5' into erp5-z2.13