[MERGE] [FIX] one2many fields: when sortign on a column of type m2o (format (id,...
authorMartin Trigaux <mat@openerp.com>
Wed, 12 Mar 2014 15:04:35 +0000 (16:04 +0100)
committerMartin Trigaux <mat@openerp.com>
Wed, 12 Mar 2014 15:04:35 +0000 (16:04 +0100)
bzr revid: mat@openerp.com-20140312150435-shq9hy3b9njkhxsn

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

Simple merge