[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Wed, 26 Mar 2014 15:23:07 +0000 (16:23 +0100)
committerFabien Meghazi <fme@openerp.com>
Wed, 26 Mar 2014 15:23:07 +0000 (16:23 +0100)
commit2eea637227bd2b85819ea39aef30060842f8b12b
treeeefe174436823b4cb70b7b595dc1dc261b823de2
parentf86967960d0a47185fd5f8158e1f5e240af4c28f
parentc2e259d8a310488e49caab566ac130099c81c334
[MERGE] upstream

bzr revid: fme@openerp.com-20140326152307-d0rn3yuzel11457g
openerp/http.py
openerp/modules/loading.py
openerp/modules/module.py