merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 18 Oct 2013 13:45:53 +0000 (15:45 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 18 Oct 2013 13:45:53 +0000 (15:45 +0200)
commitec291efb808f284d5d5650e3551d2a990d7b7b33
tree8216207e976c8337ee64aa75410bc3f2067260d7
parentc333546c359a7bfe0689e1cd562ebd929b7edcc0
merge trunk

bzr revid: nicolas.vanhoren@openerp.com-20131018134553-a7dshmtv8yp70qzp
openerp/http.py