[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 22 Mar 2013 09:09:38 +0000 (10:09 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 22 Mar 2013 09:09:38 +0000 (10:09 +0100)
commit4e74279576580152108d76d9a32c628be9077937
treed29826bbc7709ecaddaf11bab0d7a7799cb8b0d8
parent491c3b73f323f2b538500667bf4dbdb5c3882224
parent067cd7d15a86205fec0ae9d47f39f86b1e70ffd9
[MERGE] Sync with trunk.

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