[MERGE] trunk's CORS support (merge with changes)
authorFabien Meghazi <fme@openerp.com>
Thu, 30 Jan 2014 12:54:25 +0000 (13:54 +0100)
committerFabien Meghazi <fme@openerp.com>
Thu, 30 Jan 2014 12:54:25 +0000 (13:54 +0100)
commit53098c666caefa807b72f9457e159f867655f04c
tree26d969e96209d108438fa574de234e0027e8126a
parent5bb31b70d81cdc8d522e25f5e01cc0d0ea72518d
parentb63b03abd0c8109faa32803d2ae32663e1b64133
[MERGE] trunk's CORS support (merge with changes)

bzr revid: chs@openerp.com-20140130120448-tj9pu30o7dj74zid
bzr revid: fme@openerp.com-20140130125425-j1yn6p4lr7lincr3
openerp/addons/base/res/res_partner.py
openerp/http.py
openerp/osv/orm.py