From: Alicia FLOREZ <alic.florez@gmail.com>
Date: Fri, 27 Jun 2014 14:57:38 +0000 (+0200)
Subject: Merge branch 'upstream/saas-5' into saas-5
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=refs%2Fheads%2Fsaas-5;p=odoo%2Fodoo.git

Merge branch 'upstream/saas-5' into saas-5

Conflicts:
	addons/website_sale/static/src/js/website.tour.sale.js
---

f7ee9e6dd605114dd505e9bf1e790f10e66b9776