[MERGE] forward port of branch 7.0 up to 65d92da
authorChristophe Simonis <chs@odoo.com>
Wed, 5 Nov 2014 18:34:18 +0000 (19:34 +0100)
committerChristophe Simonis <chs@odoo.com>
Wed, 5 Nov 2014 18:34:18 +0000 (19:34 +0100)
commitd36eee98fb9f650989aa35472e0c0593d6df554e
tree347f130395f1b23758d9d76df13ed69bfb98a3e4
parent48ffbb68fb5aa87e90b5407091127cf308416aa6
parent65d92dadf47a833dca731f7d0cf5b0690a503777
[MERGE] forward port of branch 7.0 up to 65d92da
openerp/tools/misc.py
openerp/tools/translate.py