[MRG] merge with main branch
authorAmit Vora <avo@tinyerp.com>
Mon, 14 Apr 2014 07:18:01 +0000 (12:48 +0530)
committerAmit Vora <avo@tinyerp.com>
Mon, 14 Apr 2014 07:18:01 +0000 (12:48 +0530)
commitbf3d4a7d943de6f0765533dae04de5046e0822fa
tree062f17846f931a3a19e8d02128eeb7c946dafe69
parentcfbd8ae9f80b32088171afe45844dcadb0c0f5a6
parente82fbf7d911355c3a9acef38f83040761258dd5d
[MRG] merge with main branch

bzr revid: avo@tinyerp.com-20140414071801-3eaa6iqryfrolxbt
addons/mail/data/mail_data.xml
addons/mail/res_users.py
addons/website_partner/website_partner_demo.xml