[MERGE] OPW 18390
authorXavier ALT <xal@openerp.com>
Fri, 24 Feb 2012 10:04:28 +0000 (11:04 +0100)
committerXavier ALT <xal@openerp.com>
Fri, 24 Feb 2012 10:04:28 +0000 (11:04 +0100)
bzr revid: xal@openerp.com-20120224100428-93bfa0j0hpoz35eg

1  2 
bin/osv/orm.py

diff --cc bin/osv/orm.py
Simple merge