[MERGE]:merged from trunk
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 18 Jun 2012 04:49:43 +0000 (10:19 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 18 Jun 2012 04:49:43 +0000 (10:19 +0530)
commite7eefa188402f264de55d96df5bd0c367e7bcbe9
tree8e821ba20e32d36bb7fd599dc10ad1a5a88ed6ad
parentced87fd50798dcd388b8c0f788fe2535e211bfdd
parent10291e4673788e5459e62a6d5f1bd39769da049f
[MERGE]:merged from trunk

bzr revid: apa@tinyerp.com-20120618044943-7m0dlfcxkysle24y
addons/sale/i18n/ja.po