From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 4 Jun 2014 09:15:00 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/Mario/typo_fix', fixes #1963
X-Git-Tag: xonotic-v0.8.0~202
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1c8684681dce7c7fd05e24a69f35f405b3a02e19;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/typo_fix', fixes #1963

* origin/Mario/typo_fix:
  Fix a minor typo reported in #1949
---

1c8684681dce7c7fd05e24a69f35f405b3a02e19