[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)
1  2 
openerp/tools/misc.py
openerp/tools/translate.py

Simple merge
Simple merge