diff contrib/editmerge @ 20324:ec7bca653e51 stable

i18n-ja: synchronized with f493c2f67430
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 29 Jan 2014 21:38:10 +0900
parents 34d720b3b33e
children 864c56cb8945
line wrap: on
line diff