[MERGE]with lp:openobject-server
authorJitendra Prajapati (OpenERP) <jpr@tinyerp.com>
Tue, 4 Feb 2014 06:21:20 +0000 (11:51 +0530)
committerJitendra Prajapati (OpenERP) <jpr@tinyerp.com>
Tue, 4 Feb 2014 06:21:20 +0000 (11:51 +0530)
commite8c424c31a7f16796bcaa5878a768ad5d5cb9a26
tree93ca31815ce12dfa1f63f89f553fb2b091f6817b
parent5f746cee4898b0a46171dd8e9c10231ef0de8875
parent974bcdf97ede180be436b554761edadcea51ad26
[MERGE]with lp:openobject-server

bzr revid: jpr@tinyerp.com-20140204062120-xsqmp3xswkay026s
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/ir/ir_ui_view_view.xml