Merge branch 'upstream/saas-5' into saas-5 saas-5
authorAlicia FLOREZ <alic.florez@gmail.com>
Fri, 27 Jun 2014 14:57:38 +0000 (16:57 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Fri, 27 Jun 2014 14:57:38 +0000 (16:57 +0200)
commitf7ee9e6dd605114dd505e9bf1e790f10e66b9776
treebf89c5eb0d1d81fbdc722b4e470cb7180e3bd158
parent6b958b7b12609cd0292ee3d9a5e012bbea8f6642
parent368936df7c980e80ec46d034c5d682b078e155e5
Merge branch 'upstream/saas-5' into saas-5

Conflicts:
addons/website_sale/static/src/js/website.tour.sale.js
addons/gamification/models/challenge.py
addons/product/product.py
addons/website_mail_group/views/website_mail_group.xml
addons/website_sale/static/src/js/website.tour.sale.js