From: Arun Persaud <arun@nubati.net>
Date: Wed, 10 Sep 2014 03:15:45 +0000 (-0700)
Subject: Merge branch 'v4.7.x' into master
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=a799eb8719fdd78da3359ab5810adac322ea4365;hp=--cc;p=xboard.git

Merge branch 'v4.7.x' into master

Conflicts:
	configure.ac
	po/da.po
	po/de.po
	po/es.po
	po/it.po
	po/ru.po
	po/tr.po
	po/uk.po
	po/vi.po
	po/xboard.pot
	po/zh_CN.po
	po/zh_HK.po
	po/zh_TW.po
	winboard/config.h
---

a799eb8719fdd78da3359ab5810adac322ea4365