[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 28 Mar 2013 09:24:14 +0000 (10:24 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 28 Mar 2013 09:24:14 +0000 (10:24 +0100)
commit655ef77092d1beb1f8a0389659b4f9a5012ced77
treede3fb1e692d68ee16f2679ff07e4db456670eb13
parent5c091dd8e2ee04fd903c7ef9d1893bc71ae9bd2c
parent4ed7ec95b729f80397cfc6d18192cbec84729a34
[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20130328092414-htawc7j3jrxte866
openerp/addons/base/ir/ir_actions.py
openerp/osv/orm.py