[MERGE] from saas-3
authorChristophe Matthieu <chm@openerp.com>
Fri, 7 Feb 2014 14:09:12 +0000 (15:09 +0100)
committerChristophe Matthieu <chm@openerp.com>
Fri, 7 Feb 2014 14:09:12 +0000 (15:09 +0100)
commit598d811ea7b2394b01c51c069d1c9eb231f3550f
tree84f0f77a6a2107704b8d2ce30d1489656c750e8a
parent25117ffd0b964ea58ce3c1c1f2a0467c4d14b16a
parent76841f14e4ae1e56516d680bca09b41381d3ee75
[MERGE] from saas-3

bzr revid: chm@openerp.com-20140207140912-2tu1bhpvlap0fa4m
addons/website/models/ir_ui_view.py
addons/website/static/src/js/website.snippets.editor.js