[Merge] Merged with main branch.
authornoz (OpenERP) <noz@tinyerp.com>
Tue, 19 Jul 2011 11:54:09 +0000 (17:24 +0530)
committernoz (OpenERP) <noz@tinyerp.com>
Tue, 19 Jul 2011 11:54:09 +0000 (17:24 +0530)
commit3409288eae213df46d13837cbe5101f2072e549a
tree0326201b951ac55593df2f890a36394872b63c6c
parent8484c9577c4124236136a02b254db4b5c74d4181
parent906a94c3c788ce7d4de67415a51e55e49c46156a
[Merge] Merged with main branch.

bzr revid: noz@tinyerp.com-20110719115409-pdha2nr3o7eyss22
addons/base/controllers/main.py
addons/base/static/src/base.html
addons/base/static/src/js/chrome.js