projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a80fab6 e77725e)
[MERGE] Sync with server/trunk.
authorThibault Delavallée <tde@openerp.com>
Wed, 7 Nov 2012 08:38:07 +0000 (09:38 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 7 Nov 2012 08:38:07 +0000 (09:38 +0100)
bzr revid: tde@openerp.com-20121107083807-12i51iax0imkhjf1

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.