[MERGE]with main branch
authorJitendra Prajapati (OpenERP) <jpr@tinyerp.com>
Wed, 19 Mar 2014 05:12:26 +0000 (10:42 +0530)
committerJitendra Prajapati (OpenERP) <jpr@tinyerp.com>
Wed, 19 Mar 2014 05:12:26 +0000 (10:42 +0530)
commitbf605938b29a6a8048bd931bac23c44e67340613
treed20f7ef930589dd75a6929171477882864abf755
parentd566f09c25bb727b18acd2337aa33e79c07f6f99
parent8f8ca3bd843a02bf44fe04e96365818a0b4468c8
[MERGE]with main branch

bzr revid: jpr@tinyerp.com-20140319051226-05pee6q8ih606s1i
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/module/module.py