From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 5 Feb 2011 19:14:27 +0000 (+0100)
Subject: Merge remote branch 'origin/terencehill/typos'
X-Git-Tag: xonotic-v0.5.0~311^2~40^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dbc8b4d2c099e86d6b26b92466f1f0914b770226;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/typos'
---

dbc8b4d2c099e86d6b26b92466f1f0914b770226