[MERGE] forward port of branch saas-1 up to revid 4903 dle@openerp.com-20130909170248...
authorChristophe Simonis <chs@openerp.com>
Tue, 10 Sep 2013 12:12:30 +0000 (14:12 +0200)
committerChristophe Simonis <chs@openerp.com>
Tue, 10 Sep 2013 12:12:30 +0000 (14:12 +0200)
commit4327e09a55e74e59e6c0ae41883951d41e7146e5
tree0259647d3f4cad10043682be4ac8c441469c3091
parent749524c641dd8c30aa1c295f2fd4eb11f442d605
parente13ffe7e11e4ba1afb0aa151bb28a05139466130
[MERGE] forward port of branch saas-1 up to revid 4903 dle@openerp.com-20130909170248-a4t5y6qd5ikkhhac

bzr revid: chs@openerp.com-20130910121230-xcr2yj6rpbo83wy0
openerp/addons/base/res/res_config.py
openerp/addons/base/res/res_partner.py
openerp/addons/base/res/res_users.py
openerp/modules/loading.py
openerp/tools/mail.py