projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8353cc1 090b206)
[MERGE] Merged with server/trunk.
authorThibault Delavallée <tde@openerp.com>
Wed, 19 Sep 2012 07:50:44 +0000 (09:50 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 19 Sep 2012 07:50:44 +0000 (09:50 +0200)
bzr revid: tde@openerp.com-20120919075044-occxf1fuewlqq6kt

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

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