[MERGE]with lp:openobject-server
authorJitendra Prajapati (OpenERP) <prajapatijitendra7969@gmail.com>
Tue, 17 Dec 2013 05:07:04 +0000 (10:37 +0530)
committerJitendra Prajapati (OpenERP) <prajapatijitendra7969@gmail.com>
Tue, 17 Dec 2013 05:07:04 +0000 (10:37 +0530)
commitcce620d77d1f625d4e8c43dce1a44b237812123c
treee91cc1a9e41d85c54ca9f5451a34933f361ad0e3
parent2160a9231a8cd8a92116005b35012a1db935000c
parent00b012c01b8d4dd65c991e59aea46d25078afab9
[MERGE]with lp:openobject-server

bzr revid: pza@tinyerp.com-20131125073630-qesvbkdwkjl2d255
bzr revid: pza@tinyerp.com-20131126065101-95gv4xr5ela7lvz2
bzr revid: prajapatijitendra7969@gmail.com-20131202053725-naq4rfo79bhfn2cp
bzr revid: prajapatijitendra7969@gmail.com-20131212072509-culzc21s4w4t0hog
bzr revid: prajapatijitendra7969@gmail.com-20131217050704-1sy6zj5wksdwbo2i
openerp/addons/base/ir/ir_actions.py