[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Wed, 13 Feb 2013 08:23:52 +0000 (09:23 +0100)
committerRaphael Collet <rco@openerp.com>
Wed, 13 Feb 2013 08:23:52 +0000 (09:23 +0100)
commit6f045b48e8ab6db2a4b34536dbb286f0e2859fc3
tree61235d46508dd89661cabfe43aed79b504c72df1
parent6b459a1f279bc9568737ad75ac274facf76f29d4
parent856429efd31d956f80a5ef48a3004ee225fcebdb
[MERGE] from trunk

bzr revid: rco@openerp.com-20130213082352-t3wbhkxfh3z10ukt
doc/index.rst
openerp/osv/orm.py