[FIX] context merge
authorFabien Meghazi <fme@openerp.com>
Mon, 9 Sep 2013 07:50:31 +0000 (09:50 +0200)
committerFabien Meghazi <fme@openerp.com>
Mon, 9 Sep 2013 07:50:31 +0000 (09:50 +0200)
commite980e1c71509559cf52e08c3a76e50fbeb49b053
treec0a4d2d54103d6edace0029f342fd5c1145cc4d2
parent81118812a89091b7dfcabcf24a86ca4bf92a38ca
[FIX] context merge

bzr revid: fme@openerp.com-20130909075031-rvwxjdc07zhq0m8u
addons/website_event/controllers/main.py
addons/website_mail/controllers/main.py
addons/website_membership/controllers/main.py
addons/website_sale/controllers/main.py