[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427...
authorChristophe Simonis <chs@openerp.com>
Tue, 15 Apr 2014 14:29:34 +0000 (16:29 +0200)
committerChristophe Simonis <chs@openerp.com>
Tue, 15 Apr 2014 14:29:34 +0000 (16:29 +0200)
commit61da3f4abac15300811dc5c15614f22a6b881508
treef7d651374a3a334ff84781f28b7a2abf18eb0667
parent457b87716019dce37cadcc1c046f2882b99aeaa6
parentf8d5ef0f80c216abd2e810edd4b9761c69c36dad
[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3

bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
addons/account/account.py
addons/calendar/calendar.py
addons/mail/mail_thread.py
addons/purchase/purchase.py
addons/website/static/src/js/website.snippets.editor.js
addons/website/views/website_templates.xml
addons/website_quote/controllers/main.py
addons/website_sale/controllers/main.py