merge upstream
authorChristophe Simonis <chs@openerp.com>
Wed, 28 Nov 2012 13:56:44 +0000 (14:56 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 28 Nov 2012 13:56:44 +0000 (14:56 +0100)
commit79b2e72f07fc5843f682650ba16ea8dbb62b0713
tree1614e442bb57823535dcb7bfb9ea38e97f33942b
parente7b2ec50fe8b719d6fae13737e8c34e54eb520ab
parent2b7559316818906733d0437c05d47cd8c74b2459
merge upstream

bzr revid: chs@openerp.com-20121123165044-n5l5nqtm678abb2s
bzr revid: chs@openerp.com-20121128135644-iuiynfijiue67uth
addons/web/controllers/main.py
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/chrome.js
addons/web/static/src/js/coresetup.js
addons/web/static/src/xml/base.xml