From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 5 Oct 2010 20:08:12 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~132^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=338d89ad41e81f14b2620e028530c1f23a13c523;p=xonotic%2Fxonotic.git

Merge branch 'master' of ssh://git.xonotic.org/xonotic
---

338d89ad41e81f14b2620e028530c1f23a13c523