[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Tue, 25 Mar 2014 15:37:25 +0000 (16:37 +0100)
committerFabien Meghazi <fme@openerp.com>
Tue, 25 Mar 2014 15:37:25 +0000 (16:37 +0100)
commitf86967960d0a47185fd5f8158e1f5e240af4c28f
treee5bdeee23bcdcaf2b2f91886eeddafa1ea01e6d7
parent0f9905b9f1b0736297f55dfd222123a2ae4134f1
parentad7acd37460c1b7ee416fa703b49d096766f4835
[MERGE] upstream

bzr revid: fme@openerp.com-20140325153725-67hb463km4yvsnoe
openerp/http.py