[MERGE]with main branch
authorJitendra Prajapati (OpenERP) <jpr@tinyerp.com>
Thu, 24 Apr 2014 04:57:37 +0000 (10:27 +0530)
committerJitendra Prajapati (OpenERP) <jpr@tinyerp.com>
Thu, 24 Apr 2014 04:57:37 +0000 (10:27 +0530)
commit39312207d7b60fbf1124b0f51f4a5040c9bf095d
tree6635baa63580a907064e922dfb5aa31b02a8e055
parent1d54a738d5a57f6ad8f4272b71935a06ff8a45ee
parent700763f2da05ca70a5ff0342a7e7244c2545a9c7
[MERGE]with main branch

bzr revid: jpr@tinyerp.com-20140415053250-r784vpfu9x8gnfll
bzr revid: jpr@tinyerp.com-20140424045737-h6pshjslqw8xqyvm
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/ir/ir_ui_view.py
openerp/addons/base/module/module.py