[MERGE] forward port of branch saas-5 up to 9699f62
authorDenis Ledoux <dle@odoo.com>
Mon, 15 Sep 2014 13:24:49 +0000 (15:24 +0200)
committerDenis Ledoux <dle@odoo.com>
Mon, 15 Sep 2014 13:24:49 +0000 (15:24 +0200)
commit911f81501988d72a41851f92135a453e3931f875
treecd58163bc2f4e0e20919ad5d077f45cad44621b3
parent176e14d2bc973c8ac97455c570e3e933361e2888
parent9699f62b312911a2ec25c0da563b2e79c204aa5a
[MERGE] forward port of branch saas-5 up to 9699f62
addons/web/controllers/main.py