merge upstream
authorChristophe Simonis <chs@openerp.com>
Mon, 5 Nov 2012 09:56:21 +0000 (10:56 +0100)
committerChristophe Simonis <chs@openerp.com>
Mon, 5 Nov 2012 09:56:21 +0000 (10:56 +0100)
bzr revid: chs@openerp.com-20121105095621-a88fpp6irnatpzmr

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

Simple merge
Simple merge