[MERGE] Merge trunk
authorFabien Meghazi <fme@openerp.com>
Thu, 31 May 2012 09:20:29 +0000 (11:20 +0200)
committerFabien Meghazi <fme@openerp.com>
Thu, 31 May 2012 09:20:29 +0000 (11:20 +0200)
commit3a553c6c5984e90417ee45a01a6179261e826d6d
treec395c22c25f20a39a601f0af5d74250e37eb1318
parent2966f95ab8ed758621f36caa88fcab093c8e36ea
parent35962e14c76ae611e769e0418dcb86a40cde2cd9
[MERGE] Merge trunk

bzr revid: fme@openerp.com-20120531092029-ra0afg4nz7j0bqj5
addons/account/i18n/ja.po
addons/account_anglo_saxon/i18n/ja.po
addons/mrp/i18n/ja.po
addons/mrp_jit/i18n/ja.po
addons/mrp_operations/i18n/ja.po