[MRG] merge trunk.
authorFlorent Xicluna <florent.xicluna@gmail.com>
Wed, 8 Feb 2012 14:13:58 +0000 (15:13 +0100)
committerFlorent Xicluna <florent.xicluna@gmail.com>
Wed, 8 Feb 2012 14:13:58 +0000 (15:13 +0100)
commitd8b25ca18273b26568c63795c600cd9f8f9be8f9
tree60ab1a028a470b4656b135e26d6b7a0fb20beb57
parent111d8b76f7e384a3b1a77d802b52eedbb7ae04c7
parent301afd4baa4b2cd8ae10f3de3fe525104f993d0a
[MRG] merge trunk.

bzr revid: florent.xicluna@gmail.com-20120208141358-emgwspa0s58gtsez
openerp-server
openerp/netsvc.py
openerp/osv/fields.py
openerp/osv/orm.py
openerp/service/netrpc_server.py
openerp/service/web_services.py