[MERGE] forward port of branch saas-3 up to 685fa26
authorDenis Ledoux <dle@odoo.com>
Mon, 15 Sep 2014 13:24:19 +0000 (15:24 +0200)
committerDenis Ledoux <dle@odoo.com>
Mon, 15 Sep 2014 13:24:19 +0000 (15:24 +0200)
commit9699f62b312911a2ec25c0da563b2e79c204aa5a
treeda293a5d2b011cf5fe65284d18d31eb52a0aae98
parent163d7f5a5389fa86d2ea7938e3d2edbba9bd1c4e
parent685fa26e83e6358fcaa786b6e0358bd8b1e155f3
[MERGE] forward port of branch saas-3 up to 685fa26
addons/web/controllers/main.py