merge upstream
authorChristophe Simonis <chs@openerp.com>
Tue, 13 Dec 2011 16:25:31 +0000 (17:25 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 13 Dec 2011 16:25:31 +0000 (17:25 +0100)
commitbb852a7d94f33529ebc5f3853174deb4557c1e71
tree33f5297afe8b42cd750d73259a023499c2955737
parent78312ed1dd77aff07951cf5646bb4e38e51becb6
parent9835cebe195bc9ca9bffd5d4e2cba680d366b82b
merge upstream

bzr revid: chs@openerp.com-20111213162531-1p76dk3xknouit35
addons/web/common/session.py
addons/web/static/src/js/chrome.js
addons/web/static/src/js/core.js
addons/web/static/src/xml/base.xml