[MERGE] forward port of branch 7.0 up to d2fd05e
authorChristophe Simonis <chs@odoo.com>
Fri, 24 Oct 2014 14:52:10 +0000 (16:52 +0200)
committerChristophe Simonis <chs@odoo.com>
Fri, 24 Oct 2014 14:52:10 +0000 (16:52 +0200)
commit309ca4fcf739274a690f938c43b80c5abe11e89e
tree5dfea4993309945ed3abeec229d3c959582c4a9d
parent2c1bcfb2c90c2dbe5273e890bad173e2f345bb1b
parentd2fd05ef21173060a74958514860a9981428ec3d
[MERGE] forward port of branch 7.0 up to d2fd05e
openerp/tools/config.py