[MERGE] forward port of branch 7.0 up to b601015
authorDenis Ledoux <dle@odoo.com>
Mon, 15 Sep 2014 09:58:10 +0000 (11:58 +0200)
committerDenis Ledoux <dle@odoo.com>
Mon, 15 Sep 2014 09:58:10 +0000 (11:58 +0200)
1  2 
openerp/tools/safe_eval.py

Simple merge