[MERGE] forward port of branch saas-3 up to d36eee9
authorChristophe Simonis <chs@odoo.com>
Wed, 5 Nov 2014 18:34:53 +0000 (19:34 +0100)
committerChristophe Simonis <chs@odoo.com>
Wed, 5 Nov 2014 19:26:36 +0000 (20:26 +0100)
1  2 
openerp/tools/misc.py
openerp/tools/translate.py

Simple merge
Simple merge