[MERGE] trunk
authorAntonin Bourguignon <abo@openerp.com>
Thu, 14 Feb 2013 17:35:22 +0000 (18:35 +0100)
committerAntonin Bourguignon <abo@openerp.com>
Thu, 14 Feb 2013 17:35:22 +0000 (18:35 +0100)
commit74ba45d1fc376d30896cb622d70d4c14255ad788
tree5556f29132c3c53791c1bcbab7fe85f097d61494
parent5f080c1f9f758a2607ceaf0cee9a4f192af25f9f
parent49adee3488ff81ec86e7770bf8e7f6b3e414e6e3
[MERGE] trunk

bzr revid: abo@openerp.com-20130214173522-2ama9xjn4c2hloap
doc/changelog.rst
openerp/osv/orm.py