[MERGE] Forward-port of 7.0 bugfixes up to e2201369a314feaec70a485f0459c1dcdcecd82b
authorDenis Ledoux <dle@odoo.com>
Tue, 24 Jun 2014 11:56:51 +0000 (13:56 +0200)
committerDenis Ledoux <dle@odoo.com>
Tue, 24 Jun 2014 11:56:51 +0000 (13:56 +0200)
1  2 
addons/web/static/src/js/formats.js

Simple merge