merge_trunk
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 22 Aug 2012 13:35:09 +0000 (15:35 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 22 Aug 2012 13:35:09 +0000 (15:35 +0200)
bzr revid: fp@tinyerp.com-20120822133509-v4irlqdjjba0wxxn

1  2 
openerp/addons/base/res/res_partner_view.xml
openerp/tools/misc.py

Simple merge