projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdb1682 f318384)
[Merge] Merge with trunk-server
authorYsa (Open ERP) <ysa@tinyerp.co.in>
Wed, 17 Mar 2010 12:17:57 +0000 (17:47 +0530)
committerYsa (Open ERP) <ysa@tinyerp.co.in>
Wed, 17 Mar 2010 12:17:57 +0000 (17:47 +0530)
bzr revid: ysa@tinyerp.co.in-20100317121757-sqer70la8dacq0gh

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

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