[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Mon, 9 Sep 2013 09:31:31 +0000 (11:31 +0200)
committerThibault Delavallée <tde@openerp.com>
Mon, 9 Sep 2013 09:31:31 +0000 (11:31 +0200)
bzr revid: tde@openerp.com-20130826085405-04kpm11rfz9m6zgk
bzr revid: tde@openerp.com-20130902142029-8u7esi4j51g8xguj
bzr revid: tde@openerp.com-20130906081619-m84142whjfs2zbdg
bzr revid: tde@openerp.com-20130909093131-rnj42h1tu7s5akt2

1  2 
openerp/tools/mail.py

Simple merge