[MERGE] trunk
authorFabien Meghazi <fme@openerp.com>
Mon, 3 Sep 2012 12:46:18 +0000 (14:46 +0200)
committerFabien Meghazi <fme@openerp.com>
Mon, 3 Sep 2012 12:46:18 +0000 (14:46 +0200)
bzr revid: fme@openerp.com-20120903124618-vpe2erkcml7131gp

1  2 
openerp/addons/base/ir/ir_translation.py