[MERGE] forward port of branch saas-3 up to 309ca4f
authorChristophe Simonis <chs@odoo.com>
Fri, 24 Oct 2014 15:25:19 +0000 (17:25 +0200)
committerChristophe Simonis <chs@odoo.com>
Fri, 24 Oct 2014 15:25:19 +0000 (17:25 +0200)
commit89eaa8a8a8a60896a594c405eb0e039d322fb767
treeef2b4670c47fff8dea897903656007a2fde200a9
parent6e48c892ddc815d857800659c19d9c89fafcfff1
parent309ca4fcf739274a690f938c43b80c5abe11e89e
[MERGE] forward port of branch saas-3 up to 309ca4f
openerp/tools/config.py