[MERGE] Sync with 7.0
authorThibault Delavallée <tde@openerp.com>
Fri, 26 Apr 2013 07:45:30 +0000 (09:45 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 26 Apr 2013 07:45:30 +0000 (09:45 +0200)
commit5cafebd48a6339f1b9a7d019243444a6ffa18c1c
treec890091d410c259c65848f238e001ba839fd0312
parent027bf19a7ada495ad0bbef58cbe22bee6f21bdc3
parent7561f48578199a242da052401318055130752c12
[MERGE] Sync with 7.0

bzr revid: tde@openerp.com-20130425143838-cl9k0fpml5r0q6bi
bzr revid: tde@openerp.com-20130426074530-16h0doe2cju6xkug
addons/web/static/src/js/chrome.js