[MERGE] forward port of branch saas-3 up to b6e6b57
authorDenis Ledoux <dle@odoo.com>
Wed, 17 Sep 2014 14:25:38 +0000 (16:25 +0200)
committerDenis Ledoux <dle@odoo.com>
Wed, 17 Sep 2014 14:25:38 +0000 (16:25 +0200)
commitf9bcd67f5ba0d5f4f0b3f783566eac7c1ff1876b
treede23ed0e93fcd813d31d1261b466f9c5b174772b
parentc926b54a49936b75988f4518f07e0b74d17ac1c8
parentb6e6b57326d6a8217f58ad69286eec67e6b617d9
[MERGE] forward port of branch saas-3 up to b6e6b57
openerp/osv/orm.py