[MERGE] Sync with lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Fri, 28 Jun 2013 04:50:57 +0000 (10:20 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Fri, 28 Jun 2013 04:50:57 +0000 (10:20 +0530)
bzr revid: psa@tinyerp.com-20130628045057-iapbncjjao6tiew6

1  2 
addons/mail/mail_thread.py

Simple merge