projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e3c3af a3cef23)
[MERGE] Sync with trunk
authorJigar Amin <jam@tinyerp.com>
Wed, 17 Oct 2012 04:38:06 +0000 (10:08 +0530)
committerJigar Amin <jam@tinyerp.com>
Wed, 17 Oct 2012 04:38:06 +0000 (10:08 +0530)
bzr revid: jam@tinyerp.com-20121017043806-3z0d69nqzy9v3ojr

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.