projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d13ad7 bbb4ae3)
[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Tue, 29 Apr 2014 14:26:01 +0000 (16:26 +0200)
committerFabien Meghazi <fme@openerp.com>
Tue, 29 Apr 2014 14:26:01 +0000 (16:26 +0200)
bzr revid: fme@openerp.com-20140429142601-5pgb4l701c0deg58

1  2 
openerp/http.py patch | diff1 | diff2 | blob | history

diff --cc openerp/http.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.