Merge with trunk
authorRavi Gadhia <rga@tinyerp.com>
Thu, 1 May 2014 07:42:03 +0000 (13:12 +0530)
committerRavi Gadhia <rga@tinyerp.com>
Thu, 1 May 2014 07:42:03 +0000 (13:12 +0530)
commit3bfdd859e26c629c75f3be6df0b2f269e4128394
treef76a4f96855cb7dccac7dd3ffb9c71cfb456866b
parente8bed3e41fb97c601f8de2f53b16c3854459ee78
parent8474a2ed6f21acf377e80de6914859f3e70f8827
Merge with trunk
addons/crm/__openerp__.py
addons/crm/crm.py
addons/sale/__openerp__.py
addons/sale_crm/__openerp__.py