[MERGE] Merged with main server
authorThibault Delavallée <tde@openerp.com>
Wed, 28 Mar 2012 13:48:09 +0000 (15:48 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 28 Mar 2012 13:48:09 +0000 (15:48 +0200)
commitf0ccf9be5e50290a6672a1eff46929e9b1482912
treee037f91ec4f8fb24b373f9f053c903607e79cbd3
parentf11caea8e2b0e639d73c9db7b2b48f3f4a2e00b3
parente67101cb1e1da165638b15b29d2af9e3777c5338
[MERGE] Merged with main server

bzr revid: tde@openerp.com-20120328134809-46rwo94phicy8lj0
openerp/addons/base/i18n/ja.po