[FIX] problem with db manager
authorniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 29 Jun 2012 13:58:49 +0000 (15:58 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 29 Jun 2012 13:58:49 +0000 (15:58 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20120629135849-hrpn59w50iu8h0j1

1  2 
addons/web/controllers/main.py
addons/web/static/src/js/chrome.js
addons/web/static/src/js/coresetup.js

Simple merge
Simple merge
Simple merge