[MERGE] [FIX] Properly escape values in templates
authorFabien Meghazi <fme@openerp.com>
Wed, 13 Feb 2013 11:01:00 +0000 (12:01 +0100)
committerFabien Meghazi <fme@openerp.com>
Wed, 13 Feb 2013 11:01:00 +0000 (12:01 +0100)
lp bug: https://launchpad.net/bugs/1118593 fixed

bzr revid: fme@openerp.com-20130213110100-icz81b7fpwt6s8s8


Trivial merge