[MERGE] placeholder translation
authorAntony Lesuisse <al@openerp.com>
Wed, 27 Jun 2012 10:32:09 +0000 (12:32 +0200)
committerAntony Lesuisse <al@openerp.com>
Wed, 27 Jun 2012 10:32:09 +0000 (12:32 +0200)
commit1d487789a5455ea48f5e7c04881b1da501971339
treee2261d69f44eb71a37af4fe22a79aaa5303e0753
parent1624d47aeb7152f7e5a423e5250a3bbfc2f02f6c
parent790e3d6d9ecb604c5ea7560bbd2869b4b2843a9c
[MERGE] placeholder translation

bzr revid: al@openerp.com-20120627103209-er9lv03jeb9usu3m