[MERGE] overwrite translation terms when updating modules from command line
authorRaphael Collet <rco@openerp.com>
Fri, 16 Sep 2011 12:24:46 +0000 (14:24 +0200)
committerRaphael Collet <rco@openerp.com>
Fri, 16 Sep 2011 12:24:46 +0000 (14:24 +0200)
commit5083ac42786c9ecda47fa14eef0ba67a5995db1e
tree14c0b29a168a21b733d204c525423bfdafa9df2e
parent57e4b62f4559599e8bd9114f103569d4f98cc128
parentb37ab7abc7edd2a5f92b4c88b3c4e56edf19d3c8
[MERGE] overwrite translation terms when updating modules from command line

bzr revid: rco@openerp.com-20110916122446-gfy4rtcpwxvfnrou