[MERGE] [FIX] email_template: effectively support 'user signature'
authorThibault Delavallée <tde@openerp.com>
Thu, 24 Apr 2014 10:28:01 +0000 (12:28 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 24 Apr 2014 10:28:01 +0000 (12:28 +0200)
in the mail composer when using templates.

bzr revid: tde@openerp.com-20140424102801-j1qbqdvbyo9wv48e


Trivial merge