Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 13 Mar 2013 07:16:47 +0000 (08:16 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 13 Mar 2013 07:16:47 +0000 (08:16 +0100)
commitfaa906a97c028cb1dc5872f737a29cc7f414f6b1
tree2d94ec8f129e6c05791cf869b42f7d1382df8895
parent90c309fe33997c91663056a8f9f84f802ea8f231
parentf0153580422c2968f8ce86bc8b4499d89c92f695
Merge branch 'erp5'