[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Tue, 25 Feb 2014 09:49:14 +0000 (10:49 +0100)
committerFabien Meghazi <fme@openerp.com>
Tue, 25 Feb 2014 09:49:14 +0000 (10:49 +0100)
commit434f100fb8351368948081221d295dab3c54cd1f
treeddcbdf5bf8ed3e545b6898bbaa641314e27cc566
parentf8ddf1dcb749a6b80a209b230ef1b19a9cceac67
parenteaa20f9586f5d9a7a52ed5a7cc565d620e0ad44a
[MERGE] upstream

bzr revid: fme@openerp.com-20140225094914-419sm2gji3kiq2e2
addons/web/controllers/main.py