[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)
commit491372e865948765fdce241c7429419204ce6406
treec173e665aaad5622d637bf6ff1f7e2af95be5936
parent8b693955615f19cccff72ad2940c2c640f5f23d1
parentd36eee98fb9f650989aa35472e0c0593d6df554e
[MERGE] forward port of branch saas-3 up to d36eee9
openerp/tools/misc.py
openerp/tools/translate.py