[MERGE]Merge with Trunk
authorPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Thu, 26 Dec 2013 07:14:10 +0000 (12:14 +0500)
committerPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Thu, 26 Dec 2013 07:14:10 +0000 (12:14 +0500)
commit90717ea1b087f9d7e699713d1e9915447a59969f
tree5e6d0ac3457c94e8b5c3af88c51e8859d89ba6c2
parentc4896f47e8ecbc6c0a8b4631586023f268809a0b
parent67e479e96e97be4d9aaba21a19ebf43511407ac8
[MERGE]Merge with Trunk

bzr revid: prajapatijitendra7969@gmail.com-20131127051848-i0hrg70ro4uu68oq
bzr revid: prajapatijitendra7969@gmail.com-20131202053459-2p1zdlhgcai3bszr
bzr revid: prajapatijitendra7969@gmail.com-20131212072502-ktr7iyuietkiofl5
bzr revid: prajapatijitendra7969@gmail.com-20131217050537-thvwwcn2k599cs5l
bzr revid: pza@tinyerp.com-20131226071410-pnnr7i5lwu4qn4py
addons/mail/mail_mail_view.xml
addons/mail/mail_message.py
addons/sale/i18n/zh_TW.po