Merged with diagram branch
authorHDA (OpenERP) <hda@tinyerp.com>
Thu, 15 Apr 2010 08:43:48 +0000 (14:13 +0530)
committerHDA (OpenERP) <hda@tinyerp.com>
Thu, 15 Apr 2010 08:43:48 +0000 (14:13 +0530)
bzr revid: hda@tinyerp.com-20100415084348-x4x6nmumqm3l3qdu

1  2 
bin/addons/base/res/partner/partner_view.xml
bin/osv/orm.py

diff --cc bin/osv/orm.py
Simple merge