[MERGE] forward port of branch saas-2 up to revid 3906 chs@openerp.com-20140402083506...
authorChristophe Simonis <chs@openerp.com>
Wed, 2 Apr 2014 09:23:10 +0000 (11:23 +0200)
committerChristophe Simonis <chs@openerp.com>
Wed, 2 Apr 2014 09:23:10 +0000 (11:23 +0200)
bzr revid: chs@openerp.com-20140402092310-ixv8m1z53j107024

1  2 
addons/web/static/src/js/core.js

Simple merge