[MERGE]: sync with trunk
authorajay javiya (OpenERP) <aja@tinyerp.com>
Tue, 25 Jun 2013 12:23:38 +0000 (17:53 +0530)
committerajay javiya (OpenERP) <aja@tinyerp.com>
Tue, 25 Jun 2013 12:23:38 +0000 (17:53 +0530)
commite7d4ca7a4c896521950b03f43abe35b349461741
tree1a5dc10bd74389a199bac858ab8a83ca875b9575
parent3ca7bb5d625df0fe4dd6a08a72ee20996ad4612b
parentc180afab26171617c1c7c22db5d9836b159e5e7d
[MERGE]: sync with trunk

bzr revid: aja@tinyerp.com-20130625122338-v5rixk3s8kbv2v3b
addons/crm/crm.py
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_view.xml
addons/mail/mail_thread.py
addons/project/project.py
addons/project/project_demo.xml
addons/project/project_view.xml
addons/project_issue/project_issue.py
addons/project_issue/project_issue_view.xml