projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f042113 5be9e56)
[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)
bzr revid: chs@openerp.com-20140407144238-3s38zadkh7yxpdy7

1  2 
openerp/osv/orm.py patch | diff1 | diff2 | blob | history

diff --cc openerp/osv/orm.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.