[MERGE]with lp:openobject-server
authorJitendra Prajapati (OpenERP) <prajapatijitendra7969@gmail.com>
Mon, 20 Jan 2014 05:19:43 +0000 (10:49 +0530)
committerJitendra Prajapati (OpenERP) <prajapatijitendra7969@gmail.com>
Mon, 20 Jan 2014 05:19:43 +0000 (10:49 +0530)
commitbecabd773d1f0412e24652579dedb4bf793a20e8
tree47b76f7d3541ff657d89435db3d12729609e7ce2
parent304a33e3f0ab1716c9a8f0edb6dbb7981933d60f
parenta75ebb628c302a54e4607cbe7119e61fd227c9b9
[MERGE]with lp:openobject-server

bzr revid: prajapatijitendra7969@gmail.com-20140120051943-sms7kklx4q87hrow
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/module/module.py