From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 25 May 2010 14:57:37 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/speedlimit
X-Git-Tag: xonotic-v0.1.0preview~553^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3eba631bff0e78be89fc94ee510a3c8342107823;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/speedlimit
---

3eba631bff0e78be89fc94ee510a3c8342107823