From: Arun Persaud <arun@nubati.net>
Date: Sun, 18 Dec 2011 18:58:49 +0000 (-0800)
Subject: Merge branch 'master' into v4.6.x
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=c43235f12d0731c9f81f0693fe02f0162edc29a1

Merge branch 'master' into v4.6.x

Conflicts:
	po/uk.po -- used latest version to resolve merge conflict
---

c43235f12d0731c9f81f0693fe02f0162edc29a1