From: sdottaka <sdottaka@users.sourceforge.net>
Date: Sat, 20 Dec 2014 11:08:21 +0000 (+0900)
Subject: Merge with stable
X-Git-Tag: 2.16.4+-jp-10~933
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=87909d7a79f966336168dfdd6beebae1f8538970;p=winmerge-jp%2Fwinmerge-jp.git

Merge with stable
---

87909d7a79f966336168dfdd6beebae1f8538970