[MERGE] forward port of branch saas-3 up to revid 3967 jke@openerp.com-20140311093515...
authorChristophe Simonis <chs@openerp.com>
Tue, 11 Mar 2014 13:22:00 +0000 (14:22 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 11 Mar 2014 13:22:00 +0000 (14:22 +0100)
commitc3827cb8f78a441d4a0c71a825bbb51a7ebe4085
treec08481f8f51cd3f58aa14baa60cc32b01f2a0338
parent096432ff73057b819aefa4bfce81488711478cd8
parentf8bad6f81467658103a8ffc6d3f3eadd42b1f371
[MERGE] forward port of branch saas-3 up to revid 3967 jke@openerp.com-20140311093515-02xw8phrcqhgz6zx

bzr revid: chs@openerp.com-20140311132200-1bln6gaj80njyh18
addons/web/controllers/main.py
addons/web/views/webclient_templates.xml
addons/web_graph/static/src/js/graph_widget.js