[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Wed, 26 Mar 2014 15:24:33 +0000 (16:24 +0100)
committerFabien Meghazi <fme@openerp.com>
Wed, 26 Mar 2014 15:24:33 +0000 (16:24 +0100)
commiteb5cbea318478a0adfe347e8e486cd5b8643a51d
tree3ab4f76a906c258818f37ea6997d7a1af8f58de0
parent0195f0d8170e06ab2b83aca2209034bafda4702e
parent6ad8096210ab355fe22e7256e99ad2695d11c9c6
[MERGE] upstream

bzr revid: fme@openerp.com-20140326152433-vegu5tuvr8vc1s8v
addons/website/models/ir_http.py
addons/website/models/website.py
addons/website/static/src/js/website.editor.js