[MERGE] backport trunk revision 5053 fva@openerp.com-20140206110134-jk5zbd8cc6x1ebh5
authorChristophe Simonis <chs@openerp.com>
Thu, 6 Feb 2014 13:11:16 +0000 (14:11 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 6 Feb 2014 13:11:16 +0000 (14:11 +0100)
commit5a022d6ab338533c105410eed96f6e5822aef457
treeeeb25c90ee3b27d3a8625be1eec68fb3f3fe5597
parent73d675a73def585e17b6e00811575947ed9ccd0c
[MERGE] backport trunk revision 5053 fva@openerp.com-20140206110134-jk5zbd8cc6x1ebh5

bzr revid: chs@openerp.com-20140206131116-we6rlic5fu09xh8q
openerp/http.py