From: Arun Persaud <arun@nubati.net>
Date: Thu, 23 Feb 2012 07:19:04 +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=2d0fb98e10ba964a18ff63ea67f5abd04c6df585

Merge branch 'master' into v4.6.x

Conflicts:
	po/da.po
	po/uk.po

used version from master
---

2d0fb98e10ba964a18ff63ea67f5abd04c6df585