[MERGE] forward port of branch 7.0 up to revid b09b6a0
authorChristophe Simonis <chs@odoo.com>
Tue, 20 May 2014 16:57:04 +0000 (18:57 +0200)
committerChristophe Simonis <chs@odoo.com>
Tue, 20 May 2014 16:57:04 +0000 (18:57 +0200)
commit38abc8a006ed0848313c140d7ada9298c4b42706
treed012fdf6acf7d51f492738e96240a6d769484e59
parenta5bb6b17e2367c14208d77cb7e4a5c73dc434b1b
parentb09b6a06b10a25630b4ace62ad3e82a40941d967
[MERGE] forward port of branch 7.0 up to revid b09b6a0
openerp/addons/base/ir/ir_model.py
openerp/osv/orm.py
openerp/tools/misc.py