[MERGE] trunk
authorFabien Meghazi <fme@openerp.com>
Thu, 10 Apr 2014 17:36:30 +0000 (19:36 +0200)
committerFabien Meghazi <fme@openerp.com>
Thu, 10 Apr 2014 17:36:30 +0000 (19:36 +0200)
commit4cc3ed6fab46c5f6eed6f47e5022670bcf8cab86
tree395f4936bd98192da3c862223bab95e0b24bcad7
parentcc722b62a2907790687235c268fc7c41ae2e473e
parent95701c28c014a64c3c5e7a5b9c133269383416b7
[MERGE] trunk

bzr revid: fme@openerp.com-20140410173630-eq1uh58nba7yptf8
openerp/addons/base/ir/ir_qweb.py
openerp/http.py