[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Wed, 8 Feb 2012 12:36:10 +0000 (13:36 +0100)
committerVo Minh Thu <vmt@openerp.com>
Wed, 8 Feb 2012 12:36:10 +0000 (13:36 +0100)
commitd201a4a7469596a96e06be417337a365357d0e95
tree3a9c4c8b38c4b85fd840ea4cbd5855a978f9019d
parentba70c43dc19a13a950454630a744c8b0e20b9e5c
parent876c61b0522b595f30ba8e5ebcf5e0bbcc499a10
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120208123610-x1xhon259p2ffxpo
openerp-server
openerp/osv/osv.py
openerp/service/__init__.py
openerp/wsgi.py