[MERGE] forward port of branch 7.0 up to revid 5275 odo@openerp.com-20140407105740...
authorChristophe Simonis <chs@openerp.com>
Mon, 7 Apr 2014 14:42:38 +0000 (16:42 +0200)
committerChristophe Simonis <chs@openerp.com>
Mon, 7 Apr 2014 14:42:38 +0000 (16:42 +0200)
commit1e9ed7baf620b4d6eb6d5bed1cf7d4317d9c2c96
tree1a27030bef5d32a4f80c958ccbdc156029c1afc5
parentf042113b6fcf713b1dcb2803721268fe099ea5ad
parent5be9e5612f14916005c54226ee83e8510f3c12e4
[MERGE] forward port of branch 7.0 up to revid 5275 odo@openerp.com-20140407105740-elbz311w5u9e8eos

bzr revid: chs@openerp.com-20140407144238-3s38zadkh7yxpdy7
openerp/osv/orm.py