Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 13 May 2013 07:10:08 +0000 (09:10 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 13 May 2013 07:10:08 +0000 (09:10 +0200)
commit75ebe0005de3bf306a447d4fd70422fc82ec536f
tree59b8a6e51baae2102087344297c21e02cb192375
parentb6bad720d9983df62925174298f50803649c22ad
parent1179c76573d2a447cf2261aa2f76c4b17c0bc94b
Merge branch 'erp5' into erp5-z2.13