projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea901eb ad7acd3)
[MERGE] from trunk
authorchm@openerp.com <>
Tue, 25 Mar 2014 08:49:53 +0000 (09:49 +0100)
committerchm@openerp.com <>
Tue, 25 Mar 2014 08:49:53 +0000 (09:49 +0100)
bzr revid: chm@openerp.com-20140324082422-38x5kcnh830200wl
bzr revid: chm@openerp.com-20140325084953-s3sl2f1un7z08wxy

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.