[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)
commitdc935007402b1373d51cbbdf75df9d25465358b2
tree7074eaa04f1d5d382b6b1c650506eddaaf2857d2
parentdf557637d1010cad27029405925333e121ea58a2
parentb5c60844da1d54dacc75f77ac3f6031849b8621b
[MERGE] trunk

bzr revid: fme@openerp.com-20120903124618-vpe2erkcml7131gp
openerp/addons/base/ir/ir_translation.py