[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Wed, 13 Mar 2013 14:16:00 +0000 (15:16 +0100)
committerChristophe Matthieu <chm@openerp.com>
Wed, 13 Mar 2013 14:16:00 +0000 (15:16 +0100)
commita37aea3a857e639c5309c83537ec1e953449a860
treedc62dce6bcef704161e6fc70c847fc4fb824f987
parent8d0ed1edcce082e2dd733e1a7185aa998681ae0a
parenta67b8721848083a9336317139e508c338d925f73
[MERGE] from trunk

bzr revid: chm@openerp.com-20130313141600-pyazzzanowtrfjja
openerp/addons/base/ir/ir_actions.py
openerp/osv/orm.py