Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 4 Mar 2013 16:59:21 +0000 (17:59 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 4 Mar 2013 16:59:21 +0000 (17:59 +0100)
commit0f8e52e72ab46334996303575262bf63f291a749
tree90c66942151784de1e4f5e074e905c1e177602f7
parent0408949b9cd223ecc3492982595ca176e5362821
parent591782d6b2f47dd086eaad8b89708c31e6724daa
Merge branch 'erp5'