[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Wed, 19 Mar 2014 23:51:17 +0000 (00:51 +0100)
committerAntony Lesuisse <al@openerp.com>
Wed, 19 Mar 2014 23:51:17 +0000 (00:51 +0100)
commit666f4d0801470429dd87bdd9cbb8942fb56cf5d8
tree1e764912fad04fa6c3cc2f1b81b1e875b4c8cea5
parent48d3befa070ffd82f267e5c51ff05673824c9993
parent8f8ca3bd843a02bf44fe04e96365818a0b4468c8
[MERGE] trunk

bzr revid: al@openerp.com-20140319235117-7trt1y3927mml13u
openerp/http.py
openerp/netsvc.py