[MERGE]: merging from same branch
authorMantavya Gajjar <mga@tinyerp.com>
Wed, 3 Feb 2010 12:43:20 +0000 (18:13 +0530)
committerMantavya Gajjar <mga@tinyerp.com>
Wed, 3 Feb 2010 12:43:20 +0000 (18:13 +0530)
bzr revid: mga@tinyerp.com-20100203124320-hr3iri1u931hdu9b

1  2 
addons/crm/crm.py

Simple merge