Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Wed, 22 Oct 2014 21:42:36 +0000 (23:42 +0200)
committerOCA git bot <OCA-git-bot@therp.nl>
Wed, 22 Oct 2014 21:42:36 +0000 (23:42 +0200)
commit02e8d1a228e6dd301978246b2a756c5c33f747f3
tree1af71f87ec3da7e00857ea873f9aec7714c42070
parent3f901ae70603c95a79646151614f0c096a9fe8f5
parentb4d370173c09aa25ad129a194d94021539842771
Merge remote-tracking branch 'odoo/7.0' into 7.0
openerp/osv/orm.py