[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349...
authorChristophe Simonis <chs@openerp.com>
Mon, 24 Mar 2014 13:38:11 +0000 (14:38 +0100)
committerChristophe Simonis <chs@openerp.com>
Mon, 24 Mar 2014 13:38:11 +0000 (14:38 +0100)
commitd93b79e6f4e5c6c2fda65fbf88df8e1851b6fa4d
treef855bc221056bf09cd4713d6cd44ab6b1449a268
parent7c4557add24726f34fec3aa834c34fa5c9b1f17f
parentf4b1d23cf2b44521456b479c1038e17d5ee0bac8
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k

bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
addons/auth_oauth/controllers/main.py
addons/auth_signup/controllers/main.py
addons/auth_signup/res_users.py
addons/crm/wizard/crm_lead_to_opportunity.py
addons/website/static/src/js/website.editor.js
addons/website/static/src/js/website.snippets.editor.js
addons/website_sale/controllers/main.py
addons/website_sale/views/website_sale.xml